Merge branch 'develop' of https://github.com/Glest/glest-source into develop

This commit is contained in:
mathusummut
2019-02-03 18:16:44 +01:00
2 changed files with 7 additions and 7 deletions

View File

@@ -7,7 +7,7 @@
currentDir=$PWD currentDir=$PWD
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd $DIR cd $DIR
./build-deps.sh bash ./build-deps.sh
echo echo
./build-nodeps.sh bash ./build-nodeps.sh
cd $currentDir cd $currentDir

View File

@@ -4,9 +4,9 @@ echo "Initializing Glest setup..."
currentDir=$PWD currentDir=$PWD
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd $DIR cd $DIR
./clone-data.sh bash ./clone-data.sh
echo echo
./pull.sh bash ./pull.sh
echo echo
./build.sh bash ./build.sh
cd $currentDir cd $currentDir