Fixed travis issue+added git pull to setup.bat

This commit is contained in:
mathusummut
2018-05-14 21:38:59 +02:00
parent 1ea031b08e
commit a3dff1423d
3 changed files with 129 additions and 1 deletions

127
mk/windows/pull.bat Normal file
View File

@@ -0,0 +1,127 @@
@echo off
setlocal
echo This will update all changes from the corresponding GitHub repositories.
SET /P AREYOUSURE=Are you sure you want to do this? ([y]/n)
IF /I "%AREYOUSURE%"=="n" GOTO END
IF /I "%AREYOUSURE%"=="N" GOTO END
cd dependencies\src
echo Updating curl...
cd curl
git pull
cd ..
Echo.
echo Updating freetype...
cd freetype
git pull
cd ..
Echo.
echo Updating fribidi...
cd fribidi
git pull
cd ..
Echo.
echo Updating ftgl...
cd ftgl
git pull
cd ..
Echo.
echo Updating glew...
cd glew
git pull
cd ..
Echo.
echo Updating glut...
cd glut
git pull
cd ..
Echo.
echo Updating irc...
cd irc
git pull
cd ..
Echo.
echo Updating jpeg...
cd jpeg
git pull
cd ..
Echo.
echo Updating lua...
cd lua
git pull
cd ..
Echo.
echo Updating ogg...
cd ogg
git pull
cd ..
Echo.
echo Updating openal...
cd openal
git pull
cd ..
Echo.
echo Updating png...
cd png
git pull
cd ..
Echo.
echo Updating sdl2...
cd sdl2
git pull
cd ..
Echo.
echo Updating vorbis...
cd vorbis
git pull
cd ..
Echo.
echo Updating wxwidgets...
cd wxwidgets
git pull
cd ..
Echo.
echo Updating xerces...
cd xerces
git pull
cd ..
Echo.
echo Updating zlib...
cd zlib
git pull
cd ..
Echo.
echo Updating zetaglest-code...
cd ..\..
cd ..\..
git pull
Echo.
echo Updating zetaglest-data...
cd data
git pull
cd ..\
Echo.
cd mk\windows
:END
endlocal

View File

@@ -1,3 +1,4 @@
@echo off
call .\clone-deps.bat
call .\pull.bat
call .\build-zg.bat

View File

@@ -3115,7 +3115,7 @@ namespace
result = true;
break;
case utet_FieldChanged:
unit->setCurrField(value == 1 ? Field::fAir : Field::fLand);
unit->setCurrField(value == 1 ? Glest::Game::Field::fAir : Glest::Game::Field::fLand);
result = true;
break;
}