extensions: fix MSVC 2017 build of Library_so_activex_x64

Change-Id: Ia98c2ba085d6b7705b53dafd5368d69f0e0727c5

extensions: fix MSVC 2017 build of Library_so_activex_x64
Change-Id: Ia98c2ba085d6b7705b53dafd5368d69f0e0727c5
869a249c · Michael Stahl · 5b252750 · 869a249c
Kaydet (Commit) 869a249c authored Mar 09, 2017 tarafından Michael Stahl
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Library_so_activex_x64.mk extensions/Library_so_activex_x64.mk +3 -1

No files found.
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -50,7 +50,9 @@ $(eval $(call gb_Library_use_system_win32_libs,so_activex_x64,\
 ))

 $(eval $(call gb_Library_add_libs,so_activex_x64,\
-	$(ATL_LIB)/amd64/atls.lib \
+	$(if $(filter 140,$(VCVER)),\
+		$(ATL_LIB)/amd64/atls.lib, \
+		$(subst /x86,/x64,$(ATL_LIB)/amd64/atls.lib)) \
 ))

 # vim:set noet sw=4 ts=4: