From e9cd74adcb86d2e1e687421ef188b72780e0afce Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 8 Jul 2014 02:18:41 +0300 Subject: 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 --- extensions/Library_so_activex.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/Library_so_activex.mk') diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index cc6d96a59fe5..cd2fd90172b0 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 $(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: -- cgit v1.2.3