diff options
Diffstat (limited to 'util/buildbot/buildwin64.sh')
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index a352cc8db..5acb43b73 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -18,8 +18,19 @@ mkdir -p $builddir builddir="$( cd "$builddir" && pwd )" libdir=$builddir/libs -toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake -irrlicht_version=1.9.0mt1 +# Test which win64 compiler is present +which x86_64-w64-mingw32-gcc &>/dev/null && + toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake +which x86_64-w64-mingw32-gcc-posix &>/dev/null && + toolchain_file=$dir/toolchain_x86_64-w64-mingw32-posix.cmake + +if [ -z "$toolchain_file" ]; then + echo "Unable to determine which mingw32 compiler to use" + exit 1 +fi +echo "Using $toolchain_file" + +irrlicht_version=1.9.0mt3 ogg_version=1.3.4 vorbis_version=1.3.7 curl_version=7.76.1 @@ -29,6 +40,7 @@ sqlite3_version=3.35.5 luajit_version=2.1.0-beta3 leveldb_version=1.23 zlib_version=1.2.11 +zstd_version=1.4.9 mkdir -p $libdir @@ -55,6 +67,7 @@ download () { cd $libdir download "https://github.com/minetest/irrlicht/releases/download/$irrlicht_version/win64.zip" irrlicht-$irrlicht_version.zip download "http://minetest.kitsunemimi.pw/zlib-$zlib_version-win64.zip" +download "http://minetest.kitsunemimi.pw/zstd-$zstd_version-win64.zip" download "http://minetest.kitsunemimi.pw/libogg-$ogg_version-win64.zip" download "http://minetest.kitsunemimi.pw/libvorbis-$vorbis_version-win64.zip" download "http://minetest.kitsunemimi.pw/curl-$curl_version-win64.zip" @@ -86,7 +99,7 @@ cd $builddir mkdir build cd build -irr_dlls=$(echo $libdir/irrlicht/bin/*.dll | tr ' ' ';') +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 ' ' ';') @@ -102,14 +115,17 @@ cmake -S $sourcedir -B . \ -DENABLE_FREETYPE=1 \ -DENABLE_LEVELDB=1 \ \ - -DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \ - -DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \ + -DCMAKE_PREFIX_PATH=$libdir/irrlicht \ -DIRRLICHT_DLL="$irr_dlls" \ \ -DZLIB_INCLUDE_DIR=$libdir/zlib/include \ - -DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \ + -DZLIB_LIBRARY=$libdir/zlib/lib/libz.dll.a \ -DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \ \ + -DZSTD_INCLUDE_DIR=$libdir/zstd/include \ + -DZSTD_LIBRARY=$libdir/zstd/lib/libzstd.dll.a \ + -DZSTD_DLL=$libdir/zstd/bin/libzstd.dll \ + \ -DLUA_INCLUDE_DIR=$libdir/luajit/include \ -DLUA_LIBRARY=$libdir/luajit/libluajit.a \ \ |