diff options
| author | Tomofumi Yagi <yagit@mknada.sakura.ne.jp> | 2016-04-11 13:33:21 +0900 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2016-05-05 13:00:22 +0000 |
| commit | 3085aba021b411370ab6bc2400e0652cf279d6d3 (patch) | |
| tree | 2fe79a1b124bef58e027da1510967d9af6d7436a /config_host.mk.in | |
| parent | f07ff7ed8a23b4982ed9cd7d9e2083c9d0928384 (diff) | |
Fix linking of 64 bit artifacts in 32 bit Windows build with VS2015
In some 64bit Windows environments we get the link error while building
libraries for 64-bit Explorer extensions.
This patch will fix this error.
This error occours only when we build 32bit LibreOffice on 64bit Windows
with Visual Studio 2015.
In some environments UCRT SDK directory does not match Windows SDK
directory.
In that case UCRT library's directory path is incorrect at the linking
phase.
Change-Id: I245b1a70f5e1137a8840aa2e7a70f521eab18cb3
Reviewed-on: https://gerrit.libreoffice.org/23982
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 0a2ec0b7a46a..60b87bd24722 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -594,6 +594,8 @@ export TLS=@TLS@ export TMPDIR=@TEMP_DIRECTORY@ export TOUCH=@TOUCH@ export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@ +export UCRTSDKDIR=@UCRTSDKDIR@ +export UCRTVERSION=@UCRTVERSION@ export UNOWINREG_DLL=@UNOWINREG_DLL@ export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@ export USE_XINERAMA=@USE_XINERAMA@ |