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 /extensions/Library_so_activex_x64.mk | |
| parent | Include <algorithm> for std::min() and max() (diff) | |
| download | core-e9cd74adcb86d2e1e687421ef188b72780e0afce.tar.gz core-e9cd74adcb86d2e1e687421ef188b72780e0afce.zip | |
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 'extensions/Library_so_activex_x64.mk')
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 6d9363a91471..0951d7b09460 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Library_use_system_win32_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: |