diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-07-08 02:18:41 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-07-08 02:37:35 +0300 |
| commit | e9cd74adcb86d2e1e687421ef188b72780e0afce (patch) | |
| tree | c8cd60046d5dd725622a3effe4e725d42edf2e70 /embedserv | |
| parent | 7182db5a675d5e331281c536e15da5a82f87692e (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 'embedserv')
| -rw-r--r-- | embedserv/Library_emser.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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,\ |