summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-06-27 14:11:35 +0200
committerMichael Stahl <mstahl@redhat.com>2013-06-27 14:13:46 +0200
commit9631d68140e344379fab8606e8a31a84de9074e6 (patch)
tree198c84e03eaa1ec8e8a931ca6d75f1a952ebf1dc /configure.ac
parentf578cb783121f18791dde510a4ec3f8fa6a29e22 (diff)
Revert "fdo#65975 - fix failed compilation on windows 32bit."
This reverts commit 150d258234be57619c860c51a74410caf650cb00. This breaks the 64bit shell extensions by bundling 32bit MSVC runtimes. Change-Id: I9f958962315f0fe9e8a2f6a4bb580022b8122089 Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index b3f7876a1fb6..50368f7a6f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4881,7 +4881,7 @@ find_msvc_x64_dlls()
vsarch=x64
fi
- msvcdllpath="$VC_PRODUCT_DIR/redist/$vsarch/Microsoft.VC${VCVER}.CRT"
+ 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"
MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll"