From 7ecc6a3fb41e76ff0a56ef38b3688f6b82c9c066 Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Sat, 14 Mar 2020 20:30:38 -0500 Subject: [PATCH] Use the vcvarsall bat script. --- utils/travis/steps/install.sh | 2 +- utils/travis/steps/script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/travis/steps/install.sh b/utils/travis/steps/install.sh index 2e1c00cb20e..633e55ab125 100755 --- a/utils/travis/steps/install.sh +++ b/utils/travis/steps/install.sh @@ -47,7 +47,7 @@ elif [ "$TRAVIS_OS_NAME" = "windows" ]; then 7z x VC15.zip mv external-VC15 external cd $start - export PATH="/c/Python36:"$PATH":/c/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/MSBuild/15.0/Bin/amd64:$start/../external/dll:/c/Python36/Scripts/" + export PATH="/c/Python36:"$PATH":$start/../external/dll:/c/Python36/Scripts/" yes | pip3 install paramiko if [ "$(which python3)" == "" ] || [ "$(which sqlite3)" == "" ] || [ ! -d "../external" ]; then echo "Failed to retrieve dependencies!" diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh index 63898114983..416c212a106 100755 --- a/utils/travis/steps/script.sh +++ b/utils/travis/steps/script.sh @@ -22,7 +22,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then exit $BUILD_RET elif [ "$TRAVIS_OS_NAME" = "windows" ]; then - powershell "MSBuild.exe projectfiles/VC14/wesnoth.sln -p:Configuration=$CFG" + cmd.exe //C 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsall.bat' x86 '&&' MSBuild.exe projectfiles/VC14/wesnoth.sln -p:Configuration=$CFG -p:Platform=Win32 BUILD_RET=$? if [ "$UPLOAD_ID" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then