diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2016-02-27 15:28:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-29 13:05:20 +0100 |
| commit | 5faa9f0d3b93a19f7c05879bad86121437cf781c (patch) | |
| tree | 699cb8fa73a03b0a3b5f3f09398e160d1bfd8c17 /solenv | |
| parent | acdae154610a10b49d2d122946693967c9ca43bc (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>
(cherry picked from commit 271bfb59382e1d23e0f2c90ea8e8e31fd757e3b5)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
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))) \ |