projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix rounding error in font size making main menu and in game font sizes inconsistent
[oweals/minetest.git]
/
util
/
buildbot
/
buildwin64.sh
diff --git
a/util/buildbot/buildwin64.sh
b/util/buildbot/buildwin64.sh
index 321985e1b37baf3a0aa5b0d91bce836f8326c4bf..678d9e9529e5597a142a9a466f3c26b0ad74a20f 100755
(executable)
--- 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
irrlicht_version=1.8.1
ogg_version=1.3.1
vorbis_version=1.3.4
-curl_version=7.3
6
.0
+curl_version=7.3
8
.0
gettext_version=0.18.2
freetype_version=2.5.3
luajit_version=2.0.3
gettext_version=0.18.2
freetype_version=2.5.3
luajit_version=2.0.3
@@
-66,13
+66,19
@@
cd $libdir
# Get minetest
cd $builddir
# 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
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 ../..
# Build the thing