strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove obsolete check for pre-MSVC2013 ATL library name

Browse source 
Change-Id: I52bba4d4c0558e6b87530e4577f4b1ef458b7012
Reviewed-on: https://gerrit.libreoffice.org/16888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
This commit is contained in:
Michael Stahl 2015-07-09 13:21:01 +02:00 committed by David Ostrovsky
parent 4bdd6e8fd5
commit 24c50b6029
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embedserv/Library_emser.mk
View file

@ -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,\

2
extensions/Library_oleautobridge.mk
View file

@ -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

2
extensions/Library_so_activex.mk
View file

@ -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:

2
extensions/Library_so_activex_x64.mk
View file

@ -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:

2
winaccessibility/Library_uacccom.mk
View file

@ -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: