[Libreoffice-commits] core.git: embedserv/Library_emser.mk extensions/Library_oleautobridge.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk winaccessibility/Library_uacccom.mk

[Michael Stahl]

 embedserv/Library_emser.mk           |    2 +-
 extensions/Library_oleautobridge.mk  |    2 +-
 extensions/Library_so_activex.mk     |    2 +-
 extensions/Library_so_activex_x64.mk |    2 +-
 winaccessibility/Library_uacccom.mk  |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 24c50b6029791ed9fd14ed2c75351acd6c55e895
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 9 13:21:01 2015 +0200

    remove obsolete check for pre-MSVC2013 ATL library name
    
    Change-Id: I52bba4d4c0558e6b87530e4577f4b1ef458b7012
    Reviewed-on: https://gerrit.libreoffice.org/16888
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>

diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 904baa4..c6c5b9a 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 cd3823b..5dde7cc 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 cd2fd901..5fc012a 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 0951d7b..d330ca8 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 5dd86b0..f48dfec 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: