0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the vcvarsall bat script.

Browse source
This commit is contained in:
Pentarctagon 2020-03-14 20:30:38 -05:00 • committed by Pentarctagon
parent fceb2e3b78
commit 7ecc6a3fb4
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/travis/steps/install.sh
View file

@ -47,7 +47,7 @@ elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
7z x VC15.zip 7z x VC15.zip
mv external-VC15 external mv external-VC15 external
cd $start 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 yes | pip3 install paramiko
if [ "$(which python3)" == "" ] || [ "$(which sqlite3)" == "" ] || [ ! -d "../external" ]; then if [ "$(which python3)" == "" ] || [ "$(which sqlite3)" == "" ] || [ ! -d "../external" ]; then
echo "Failed to retrieve dependencies!" echo "Failed to retrieve dependencies!"

2
utils/travis/steps/script.sh
View file

@ -22,7 +22,7 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
exit $BUILD_RET exit $BUILD_RET
elif [ "$TRAVIS_OS_NAME" = "windows" ]; then 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=$? BUILD_RET=$?
if [ "$UPLOAD_ID" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then if [ "$UPLOAD_ID" != "" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then