Kaydet (Commit) 9edaf808 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Reinstate settting of vsarch which is used a few lines below

Change-Id: I1214498e57fcbb2b7208c213a2b98dc7dc3bf3ae
üst 60790b3f
...@@ -4897,6 +4897,12 @@ find_msms() ...@@ -4897,6 +4897,12 @@ find_msms()
find_msvc_x64_dlls() find_msvc_x64_dlls()
{ {
if test "$VCVER" != "90"; then 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" 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" MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT"
msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll" msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment