comparison deploy/win64/build-64.bat @ 1845:69b7ee11e9ab plugin-path-config

Merge from default branch
author Chris Cannam
date Thu, 07 Jun 2018 11:36:53 +0100
parents 2b09b4dce8c4 9f26f92bf89f
children 5c39e3d2ab5c
comparison
equal deleted inserted replaced
1844:2b09b4dce8c4 1845:69b7ee11e9ab
3 3
4 echo on 4 echo on
5 5
6 set STARTPWD=%CD% 6 set STARTPWD=%CD%
7 7
8 set QTDIR=C:\Qt\5.10.1\msvc2017_64 8 set QTDIR=C:\Qt\5.11.0\msvc2017_64
9 if not exist %QTDIR% ( 9 if not exist %QTDIR% (
10 @ echo Could not find 64-bit Qt 10 @ echo Could not find 64-bit Qt
11 @ exit /b 11 @ exit /b 2
12 ) 12 )
13 13
14 if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" ( 14 if not exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" (
15 @ echo "Could not find MSVC vars batch file" 15 @ echo "Could not find MSVC vars batch file"
16 @ exit /b 16 @ exit /b 2
17 ) 17 )
18 18
19 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 19 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
20 20
21 set ORIGINALPATH=%PATH% 21 set ORIGINALPATH=%PATH%