extensions/Library_so_activex_x64.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 869a249cebaf58d13812194297561fc361dd3a36
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Mar 9 18:40:40 2017 +0100
extensions: fix MSVC 2017 build of Library_so_activex_x64
Change-Id: Ia98c2ba085d6b7705b53dafd5368d69f0e0727c5
diff --git a/extensions/Library_so_activex_x64.mk
b/extensions/Library_so_activex_x64.mk
index d330ca8..e1c4b9a 100644
--- 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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
