Mercurial > hg > easyhg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix incorrect packaging of 64-bit CRT with 32-bit binaries
author Chris Cannam
date Thu, 13 Dec 2018 07:10:21 +0000
parents 52b8a499f379
children 7942b7633505
line wrap: on
line diff
--- a/deploy/win32/build-and-package.bat	Wed Dec 12 14:32:31 2018 +0000
+++ b/deploy/win32/build-and-package.bat	Thu Dec 13 07:10:21 2018 +0000
@@ -10,7 +10,7 @@
 @   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
 )
@@ -27,7 +27,7 @@
 
 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/