summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-07-08 02:18:41 +0300
committerTor Lillqvist <tml@collabora.com>2014-07-08 02:37:35 +0300
commite9cd74adcb86d2e1e687421ef188b72780e0afce (patch)
treec8cd60046d5dd725622a3effe4e725d42edf2e70 /winaccessibility
parent7182db5a675d5e331281c536e15da5a82f87692e (diff)
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
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/Library_uacccom.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk
index fb72fce89a66..5dd86b03ba57 100644
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -77,7 +77,7 @@ $(eval $(call gb_Library_use_system_win32_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: