solenv/gbuild/platform/com_MSC_class.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 51a6fa350566350c84ceadb5df65a9b047ca77e8
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Mar 9 17:54:39 2017 +0100
gbuild: fix LIBPATH for LIBRARY_X64 with MSVC 2017
Change-Id: I88601e8ad3d21554d6b8166bd7689e0a3b8b3a9f
diff --git a/solenv/gbuild/platform/com_MSC_class.mk
b/solenv/gbuild/platform/com_MSC_class.mk
index 1aef938..23bb57e 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -175,7 +175,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter YES,$(LIBRARY_X64)),,$(if $(filter
YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS$(MSC_SUBSYSTEM_VERSION),
-SUBSYSTEM:CONSOLE$(MSC_SUBSYSTEM_VERSION))) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64) \
$(if $(filter YES,$(LIBRARY_X64)), \
- -LIBPATH:$(COMPATH)/lib/amd64 \
+ -LIBPATH:$(COMPATH)/lib/$(if $(filter
140,$(VCVER)),amd64,x64) \
-LIBPATH:$(WINDOWS_SDK_HOME)/lib/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:$(UCRTSDKDIR)lib/$(UCRTVERSION)/ucrt/x64)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
