diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-02-27 15:28:20 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2016-02-27 21:21:49 +0000 |
| commit | 271bfb59382e1d23e0f2c90ea8e8e31fd757e3b5 (patch) | |
| tree | d4a6f4564345e25a6232c2d0fe40eedfc2cfed45 /solenv | |
| parent | e04c734f56d7e4a16a2dd1b64a51cecbdf6796cf (diff) | |
MSVC 14.0: Fix building 64bit libraries in 32bit mode
Change-Id: I006d21b6240898cbaed2b382276654d3ad8076a2
Reviewed-on: https://gerrit.libreoffice.org/22732
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 4dbdb903b49f..93645a145638 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))) \ |