configure.ac | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 9edaf808c567cb54477b522c51416921c4811d2e
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed May 29 10:27:25 2013 +0300
Reinstate settting of vsarch which is used a few lines below
Change-Id: I1214498e57fcbb2b7208c213a2b98dc7dc3bf3ae
diff --git a/configure.ac b/configure.ac
index 7ce517b..13f84e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4897,6 +4897,12 @@ find_msms()
find_msvc_x64_dlls()
{
if test "$VCVER" != "90"; then
+ if test "$CPUNAME" = "INTEL"; then
+ vsarch=x86
+ else
+ vsarch=x64
+ fi
+
msvcdllpath="$VC_PRODUCT_DIR/redist/x64/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"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
