X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util%2Fbuildbot%2Fbuildwin64.sh;h=678d9e9529e5597a142a9a466f3c26b0ad74a20f;hb=aaec558f854c3eacb7bd8b0fe7e14d2ee35ab5ed;hp=eed33d2f9287d8327cc331c7dd5b07aa0129fe5b;hpb=ce9f1e1d3cacb8e81436a63254cb1d70cad7a0ed;p=oweals%2Fminetest.git

diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index eed33d2f9..678d9e952 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -16,7 +16,7 @@ toolchain_file=$dir/toolchain_mingw64.cmake
 irrlicht_version=1.8.1
 ogg_version=1.3.1
 vorbis_version=1.3.4
-curl_version=7.36.0
+curl_version=7.38.0
 gettext_version=0.18.2
 freetype_version=2.5.3
 luajit_version=2.0.3
@@ -66,57 +66,76 @@ cd $libdir
 
 # Get minetest
 cd $builddir
-[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
+if [ -d $EXISTING_MINETEST_DIR ]; then
+	ln -s $EXISTING_MINETEST_DIR minetest
+else
+	[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
+fi
 cd minetest
 git_hash=`git show | head -c14 | tail -c7`
 
 # Get minetest_game
 cd games
-[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
+if [ "x$NO_MINETEST_GAME" = "x" ]; then
+	[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
+fi
 cd ../..
 
 # Build the thing
 cd minetest
-[ -d build ] && rm -Rf build/
-mkdir build
-cd build
+[ -d _build ] && rm -Rf _build/
+mkdir _build
+cd _build
 cmake .. \
 	-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
 	-DCMAKE_INSTALL_PREFIX=/tmp \
 	-DVERSION_EXTRA=$git_hash \
 	-DBUILD_CLIENT=1 -DBUILD_SERVER=0 \
+	\
 	-DENABLE_SOUND=1 \
 	-DENABLE_CURL=1 \
 	-DENABLE_GETTEXT=1 \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
+	\
 	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
 	-DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win64-gcc/libIrrlicht.dll.a \
 	-DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win64-gcc/Irrlicht.dll \
+	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
 	-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
 	-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \
+	\
 	-DLUA_INCLUDE_DIR=$libdir/luajit/include \
 	-DLUA_LIBRARY=$libdir/luajit/libluajit.a \
+	\
 	-DOGG_INCLUDE_DIR=$libdir/libogg/include \
 	-DOGG_LIBRARY=$libdir/libogg/lib/libogg.dll.a \
 	-DOGG_DLL=$libdir/libogg/bin/libogg-0.dll \
+	\
 	-DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include \
 	-DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a \
 	-DVORBIS_DLL=$libdir/libvorbis/bin/libvorbis-0.dll \
 	-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \
 	-DVORBISFILE_DLL=$libdir/libvorbis/bin/libvorbisfile-3.dll \
+	\
 	-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 \
+	\
 	-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
 	-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
 	-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
+	\
 	-DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2 \
 	-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2 \
 	-DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a \
+	-DFREETYPE_DLL=$libdir/freetype/bin/libfreetype-6.dll \
+	\
 	-DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \
 	-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
+	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll \
+	\
 	-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
 	-DGETTEXT_MSGFMT=`which msgfmt` \
 	-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \