diff options
Diffstat (limited to 'util/buildbot/buildwin64.sh')
-rwxr-xr-x | util/buildbot/buildwin64.sh | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 81fbf43fa..92715fa64 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -1,6 +1,13 @@ #!/bin/bash set -e +CORE_GIT=https://github.com/minetest/minetest +CORE_BRANCH=master +CORE_NAME=minetest +GAME_GIT=https://github.com/minetest/minetest_game +GAME_BRANCH=master +GAME_NAME=minetest_game + dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ $# -ne 1 ]; then echo "Usage: $0 <build directory>" @@ -12,16 +19,16 @@ builddir="$( cd "$builddir" && pwd )" packagedir=$builddir/packages libdir=$builddir/libs -toolchain_file=$dir/toolchain_mingw64.cmake +toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake irrlicht_version=1.8.4 ogg_version=1.3.2 vorbis_version=1.3.5 -curl_version=7.54.0 +curl_version=7.65.3 gettext_version=0.19.8.1 -freetype_version=2.8 -sqlite3_version=3.19.2 +freetype_version=2.9.1 +sqlite3_version=3.27.2 luajit_version=2.1.0-beta3 -leveldb_version=1.19 +leveldb_version=1.20 zlib_version=1.2.11 mkdir -p $packagedir @@ -71,22 +78,22 @@ cd $libdir # Get minetest cd $builddir if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then - ln -s $EXISTING_MINETEST_DIR minetest + ln -s $EXISTING_MINETEST_DIR $CORE_NAME else - [ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest) + [ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT) fi -cd minetest +cd $CORE_NAME git_hash=$(git rev-parse --short HEAD) # Get minetest_game cd games if [ "x$NO_MINETEST_GAME" = "x" ]; then - [ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game) + [ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT) fi cd ../.. # Build the thing -cd minetest +cd $CORE_NAME [ -d _build ] && rm -Rf _build/ mkdir _build cd _build @@ -150,7 +157,7 @@ cmake .. \ -DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \ -DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll -make -j2 +make -j$(nproc) [ "x$NO_PACKAGE" = "x" ] && make package |