diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-09 13:21:01 +0200 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-07-09 14:22:21 +0000 |
| commit | 24c50b6029791ed9fd14ed2c75351acd6c55e895 (patch) | |
| tree | d3a292f06dc6c6c2ba9bfc2f5150a71b82d0103c | |
| parent | 4bdd6e8fd5ea5318553b3f8834fce705da5ae5d3 (diff) | |
remove obsolete check for pre-MSVC2013 ATL library name
Change-Id: I52bba4d4c0558e6b87530e4577f4b1ef458b7012
Reviewed-on: https://gerrit.libreoffice.org/16888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
| -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 904baa49a5f3..c6c5b9aa6e62 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\ )) $(eval $(call gb_Library_add_libs,emser,\ - $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ + $(ATL_LIB)/atls.lib \ )) $(eval $(call gb_Library_add_ldflags,emser,\ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index cd3823b14322..5dde7ccee203 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_libs,oleautobridge,\ - $(ATL_LIB)/$(if $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ + $(ATL_LIB)/atls.lib \ )) endif diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index cd2fd90172b0..5fc012a0f82d 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 $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ + $(ATL_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 0951d7b09460..d330ca8a3bf0 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 $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ + $(ATL_LIB)/amd64/atls.lib \ )) # vim:set noet sw=4 ts=4: diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk index 5dd86b03ba57..f48dfecf2688 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 $(filter 120,$(VCVER)),atls.lib,$(if $(MSVC_USE_DEBUG_RUNTIME),atlsd.lib,atls.lib)) \ + $(ATL_LIB)/atls.lib \ )) # vim:set noet sw=4 ts=4: |