diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-06-20 17:33:09 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-06-26 22:06:22 +0000 |
| commit | 150d258234be57619c860c51a74410caf650cb00 (patch) | |
| tree | a6e062f2ef8563b1871d875b720dcd2d452176a6 /configure.ac | |
| parent | 9040f3f80bf745bc11ad608d0e800b11c485e0bb (diff) | |
fdo#65975 - fix failed compilation on windows 32bit.
Change-Id: I69033856962e8d716f059dca9a9d68cd40ec429c
Reviewed-on: https://gerrit.libreoffice.org/4401
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f5a72d644cc5..5e0192329f80 100644 --- a/configure.ac +++ b/configure.ac @@ -4874,7 +4874,14 @@ find_msms() find_msvc_x64_dlls() { if test "$VCVER" != "90"; then - msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" + + if test "$CPUNAME" = "INTEL"; then + vsarch=x86 + else + vsarch=x64 + fi + + msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT" MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT" msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll" MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll" |