comparison deploy/win32/build-and-package.bat @ 718:dfabf544f682

Fix incorrect packaging of 64-bit CRT with 32-bit binaries

 if not exist "C:\Program Files (x86)\WiX Toolset v3.11\bin" (
 @   echo Could not find WiX Toolset
 @   exit /b 2
 )
 
-if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT" (
+if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x86\Microsoft.VC141.CRT" (
 @   echo Could not find Windows CRT directory
 @   exit /b 2
 )
 
 if not exist "C:/Python27/Lib/site-packages/PyQt5/" (

 @   exit /b 2
 )
 
 set ORIGINALPATH=%PATH%
 set PATH=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin;%PATH%
-set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x64\Microsoft.VC141.CRT
+set CRTDIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.15.26706\x86\Microsoft.VC141.CRT
 set PYPACKAGEDIR=C:/Python27/Lib/site-packages
 set PYQTDIR=%PYPACKAGEDIR%/PyQt5/
 set PYCRYPTODIR=%PYPACKAGEDIR%/Crypto/
 set NAME=Open Source Developer, Christopher Cannam