Kaydet (Commit) e9cd74ad authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 7182db5a
...@@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_system_win32_libs,emser,\ ...@@ -43,7 +43,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 $(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,\ $(eval $(call gb_Library_add_ldflags,emser,\
......
...@@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_system_win32_libs,oleautobridge,\ ...@@ -46,7 +46,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 $(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 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 $(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: # 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 $(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: # 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 $(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: # 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