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 --- embedserv/Library_emser.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'embedserv') diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk index a85e4c70cf83..6ff4223a832a 100644 --- a/embedserv/Library_emser.mk +++ b/embedserv/Library_emser.mk @@ -43,7 +43,7 @@ $(eval $(call gb_Library_use_system_win32_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,\ -- cgit