X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=util%2Fbuildbot%2Fbuildwin64.sh;h=923ca66133815064d5b9cbe29174a0491ff85afa;hb=3ff3103e98b350712543f926c429ab339700e252;hp=f8ff3cfdd91c12e99abb66e0c9be43976b57f681;hpb=c510037e9a334b3327a6d6b066203618051e4a09;p=dragonfireclient.git

diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index f8ff3cfdd..923ca6613 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 set -e
 
-CORE_GIT=https://github.com/minetest/minetest
+GIT_ORG=https://github.com/dragonfireclient
+CORE_GIT=$GIT_ORG/dragonfireclient
 CORE_BRANCH=master
-CORE_NAME=minetest
-GAME_GIT=https://github.com/minetest/minetest_game
+CORE_NAME=dragonfireclient
+GAME_GIT=https://git.minetest.land/MineClone2/MineClone2
 GAME_BRANCH=master
-GAME_NAME=minetest_game
+GAME_NAME=MineClone2
+CLIENT_MODS="autotool diglib digcustom nametags autokey autoeat invutil killaura worldutil physics_override noweather chateffects simpletp"
 
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ $# -ne 1 ]; then
@@ -31,24 +33,32 @@ fi
 toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
 echo "Using $toolchain_file"
 
-tmp=$(dirname "$(command -v $compiler)")/../x86_64-w64-mingw32/bin
+# Try to find runtime DLLs in various paths (varies by distribution, sigh)
+tmp=$(dirname "$(command -v $compiler)")/..
 runtime_dlls=
-[ -d "$tmp" ] && runtime_dlls=$(echo $tmp/lib{gcc_,stdc++-,winpthread-}*.dll | tr ' ' ';')
+for name in lib{gcc_,stdc++-,winpthread-}'*'.dll; do
+	for dir in $tmp/x86_64-w64-mingw32/{bin,lib} $tmp/lib/gcc/x86_64-w64-mingw32/*; do
+		[ -d "$dir" ] || continue
+		file=$(echo $dir/$name)
+		[ -f "$file" ] && { runtime_dlls+="$file;"; break; }
+	done
+done
 [ -z "$runtime_dlls" ] &&
 	echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
 
 # Get stuff
-irrlicht_version=1.9.0mt3
-ogg_version=1.3.4
+irrlicht_version=1.9.0mt6
+ogg_version=1.3.5
+openal_version=1.21.1
 vorbis_version=1.3.7
-curl_version=7.76.1
+curl_version=7.81.0
 gettext_version=0.20.1
-freetype_version=2.10.4
-sqlite3_version=3.35.5
+freetype_version=2.11.1
+sqlite3_version=3.37.2
 luajit_version=2.1.0-beta3
 leveldb_version=1.23
 zlib_version=1.2.11
-zstd_version=1.4.9
+zstd_version=1.5.2
 
 mkdir -p $libdir
 
@@ -83,19 +93,32 @@ download "http://minetest.kitsunemimi.pw/freetype2-$freetype_version-win64.zip"
 download "http://minetest.kitsunemimi.pw/sqlite3-$sqlite3_version-win64.zip"
 download "http://minetest.kitsunemimi.pw/luajit-$luajit_version-win64.zip"
 download "http://minetest.kitsunemimi.pw/libleveldb-$leveldb_version-win64.zip" leveldb-$leveldb_version.zip
-download "http://minetest.kitsunemimi.pw/openal_stripped64.zip" 'openal_stripped.zip' unzip_nofolder
+download "http://minetest.kitsunemimi.pw/openal-soft-$openal_version-win64.zip"
 
 # Set source dir, downloading Minetest as needed
 if [ -n "$EXISTING_MINETEST_DIR" ]; then
 	sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )"
 else
+	cd $builddir
 	sourcedir=$PWD/$CORE_NAME
 	[ -d $CORE_NAME ] && { pushd $CORE_NAME; git pull; popd; } || \
 		git clone -b $CORE_BRANCH $CORE_GIT $CORE_NAME
 	if [ -z "$NO_MINETEST_GAME" ]; then
+		cd $sourcedir
 		[ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \
 			git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME
 	fi
+	rm -f clientmods/mods.conf
+	for mod in $CLIENT_MODS; do
+		cd $sourcedir
+		[ -d clientmods/$mod ] && { pushd clientmods/$mod; git pull; popd; } || \
+			git clone $GIT_ORG/$mod clientmods/$mod
+		echo "load_mod_$mod = true" >> clientmods/mods.conf
+	done
+	cd $sourcedir
+	[ -d clientmods/lua_async ] && { pushd clientmods/lua_async; git pull; popd; } || \
+		git clone --recursive https://github.com/EliasFleckenstein03/lua_async_mt clientmods/lua_async
+	echo "load_mod_lua_async = true" >> clientmods/mods.conf
 fi
 
 git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
@@ -103,14 +126,12 @@ git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
 # Build the thing
 cd $builddir
 [ -d build ] && rm -rf build
-mkdir build
-cd build
 
 irr_dlls=$(echo $libdir/irrlicht/lib/*.dll | tr ' ' ';')
 vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
 gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
 
-cmake -S $sourcedir -B . \
+cmake -S $sourcedir -B build \
 	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
 	-DCMAKE_INSTALL_PREFIX=/tmp \
 	-DVERSION_EXTRA=$git_hash \
@@ -120,7 +141,6 @@ cmake -S $sourcedir -B . \
 	-DENABLE_SOUND=1 \
 	-DENABLE_CURL=1 \
 	-DENABLE_GETTEXT=1 \
-	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
 	-DCMAKE_PREFIX_PATH=$libdir/irrlicht \
@@ -146,9 +166,9 @@ cmake -S $sourcedir -B . \
 	-DVORBIS_DLL="$vorbis_dlls" \
 	-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \
 	\
-	-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include/AL \
-	-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
-	-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
+	-DOPENAL_INCLUDE_DIR=$libdir/openal/include/AL \
+	-DOPENAL_LIBRARY=$libdir/openal/lib/libOpenAL32.dll.a \
+	-DOPENAL_DLL=$libdir/openal/bin/OpenAL32.dll \
 	\
 	-DCURL_DLL=$libdir/curl/bin/libcurl-4.dll \
 	-DCURL_INCLUDE_DIR=$libdir/curl/include \
@@ -172,9 +192,9 @@ cmake -S $sourcedir -B . \
 	-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
 	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
 
-make -j$(nproc)
+cmake --build build -j$(nproc)
 
-[ -z "$NO_PACKAGE" ] && make package
+[ -z "$NO_PACKAGE" ] && cmake --build build --target package
 
 exit 0
 # EOF