solenv/gbuild/platform/com_MSC_class.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 271bfb59382e1d23e0f2c90ea8e8e31fd757e3b5
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Sat Feb 27 15:28:20 2016 +0100
MSVC 14.0: Fix building 64bit libraries in 32bit mode
Change-Id: I006d21b6240898cbaed2b382276654d3ad8076a2
Reviewed-on: https://gerrit.libreoffice.org/22732
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: David Ostrovsky <da...@ostrovsky.org>
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 4dbdb90..93645a1 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -171,7 +171,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter YES,$(LIBRARY_X64)), \
-LIBPATH:$(COMPATH)/lib/amd64 \
-LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64 \
- $(if $(filter 80
81,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64))
\
+ $(if $(filter 80 81
10,$(WINDOWS_SDK_VERSION)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/um/x64)
\
+ $(if $(filter-out
120,$(VCVER)),-LIBPATH:$(WINDOWS_SDK_HOME)/lib/$(WINDOWS_SDK_LIB_SUBDIR)/ucrt/x64))
\
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_ilibfilename,$(lib))) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
