diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-08 02:18:41 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-08 02:37:35 +0300 |
| commit | e9cd74adcb86d2e1e687421ef188b72780e0afce (patch) | |
| tree | c8cd60046d5dd725622a3effe4e725d42edf2e70 | |
| parent | 7182db5a675d5e331281c536e15da5a82f87692e (diff) | |
No atlsd.lib in VS 2013
Instead, atls.lib should be used also with code compiled to use the
debugging runtime. See
http://msdn.microsoft.com/en-us/library/bb531344.aspx which says
"Atls.lib no longer has character-set dependencies or code that's
specific for debug/release. Because it works the same for Unicode/ANSI
and debug/release, only one version of the library is required."
Change-Id: Ie39ea271513dec1084cae8d1bbf93afa286f357a
| -rw-r--r-- | embedserv/Library_emser.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_oleautobridge.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_so_activex.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 2 | ||||
| -rw-r--r-- | winaccessibility/Library_uacccom.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index a85e4c70cf83..6ff4223a832a 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\ )) $(eval $(call gb_Library_add_libs,emser,\ - $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ + $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ )) $(eval $(call gb_Library_add_ldflags,emser,\ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 069434c06f98..7bf936e311f9 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,oleautobridge,\ - $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ + $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ )) endif diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index cc6d96a59fe5..cd2fd90172b0 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\ )) $(eval $(call gb_Library_add_libs,so_activex,\ - $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ + $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ )) # vim:set noet sw=4 ts=4: diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 6d9363a91471..0951d7b09460 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ )) $(eval $(call gb_Library_add_libs,so_activex_x64,\ - $(ATL_LIB)/amd64/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ + $(ATL_LIB)/amd64/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ )) # vim:set noet sw=4 ts=4: diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk index fb72fce89a66..5dd86b03ba57 100644 --- a/winaccessibility/Library_uacccom.mk +++ b/winaccessibility/Library_uacccom.mk @@ -77,7 +77,7 @@ $(eval $(call gb_Library_use_system_win32_libs,UAccCOM,\ )) $(eval $(call gb_Library_add_libs,UAccCOM,\ - $(ATL_LIB)/$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib) \ + $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ )) # vim:set noet sw=4 ts=4: |