Kaydet (Commit) 24c50b60 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) David Ostrovsky

remove obsolete check for pre-MSVC2013 ATL library name

Change-Id: I52bba4d4c0558e6b87530e4577f4b1ef458b7012
Reviewed-on: https://gerrit.libreoffice.org/16888Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarDavid Ostrovsky <david@ostrovsky.org>
üst 4bdd6e8f
...@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\ ...@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\
)) ))
$(eval $(call gb_Library_add_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,\ $(eval $(call gb_Library_add_ldflags,emser,\
......
...@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ ...@@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_libs,oleautobridge,\ $(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 endif
......
...@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\ ...@@ -47,7 +47,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex,\
)) ))
$(eval $(call gb_Library_add_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: # vim:set noet sw=4 ts=4:
...@@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\ ...@@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
)) ))
$(eval $(call gb_Library_add_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: # vim:set noet sw=4 ts=4:
...@@ -77,7 +77,7 @@ $(eval $(call gb_Library_use_system_win32_libs,UAccCOM,\ ...@@ -77,7 +77,7 @@ $(eval $(call gb_Library_use_system_win32_libs,UAccCOM,\
)) ))
$(eval $(call gb_Library_add_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: # vim:set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment