Update Windows build script for VS2019

This commit is contained in:
noisyshape 2019-04-10 14:08:09 -04:00 committed by GitHub
parent acca0d7f6f
commit 47aac5081f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -18,6 +18,9 @@ set BONJOUR_SDK_HOME=%B_BONJOUR%
REM full path to Qt stuff we need REM full path to Qt stuff we need
set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC% set B_QT_FULLPATH=%B_QT_ROOT%\%B_QT_VER%\%B_QT_MSVC%
REM cmake generator name for the target build system
set cmake_gen=Visual Studio 16 2019
echo Bonjour: %BONJOUR_SDK_HOME% echo Bonjour: %BONJOUR_SDK_HOME%
echo Qt: %B_QT_FULLPATH% echo Qt: %B_QT_FULLPATH%
@ -25,7 +28,7 @@ rmdir /q /s build
mkdir build mkdir build
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed
cd build cd build
cmake -G "Visual Studio 15 2017 Win64" -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% .. cmake -G "%cmake_gen%" -D CMAKE_BUILD_TYPE=%B_BUILD_TYPE% -D CMAKE_PREFIX_PATH="%B_QT_FULLPATH%" -D DNSSD_LIB="%B_BONJOUR%\Lib\x64\dnssd.lib" -D QT_VERSION=%B_QT_VER% ..
if ERRORLEVEL 1 goto failed if ERRORLEVEL 1 goto failed
echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat echo @msbuild barrier.sln /p:Platform="x64" /p:Configuration=%B_BUILD_TYPE% /m %B_BUILD_OPTIONS% > make.bat
call make.bat call make.bat
@ -69,3 +72,4 @@ set B_BONJOUR=
set BONJOUR_SDK_HOME= set BONJOUR_SDK_HOME=
set B_QT_FULLPATH= set B_QT_FULLPATH=
set savedir= set savedir=
set cmake_gen=