|
@@ -60,7 +60,6 @@ cd $builddir
|
|
|
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.kitsunemimi.pw/openal_stripped64.zip \
|
|
|
-c -O $packagedir/openal_stripped.zip
|
|
|
|
|
|
-
|
|
|
# Extract stuff
|
|
|
cd $libdir
|
|
|
[ -d irrlicht ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip -d irrlicht
|
|
@@ -75,32 +74,32 @@ cd $libdir
|
|
|
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
|
|
|
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
|
|
|
|
|
|
-# Get minetest
|
|
|
-cd $builddir
|
|
|
-if [ ! "x$EXISTING_MINETEST_DIR" = "x" ]; then
|
|
|
- cd /$EXISTING_MINETEST_DIR # must be absolute path
|
|
|
+# Set source dir, downloading Minetest as needed
|
|
|
+if [ -n "$EXISTING_MINETEST_DIR" ]; then
|
|
|
+ sourcedir="$( cd "$EXISTING_MINETEST_DIR" && pwd )"
|
|
|
else
|
|
|
- [ -d $CORE_NAME ] && (cd $CORE_NAME && git pull) || (git clone -b $CORE_BRANCH $CORE_GIT)
|
|
|
- cd $CORE_NAME
|
|
|
+ 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
|
|
|
+ [ -d games/$GAME_NAME ] && { pushd games/$GAME_NAME; git pull; popd; } || \
|
|
|
+ git clone -b $GAME_BRANCH $GAME_GIT games/$GAME_NAME
|
|
|
+ fi
|
|
|
fi
|
|
|
-git_hash=$(git rev-parse --short HEAD)
|
|
|
|
|
|
-# Get minetest_game
|
|
|
-if [ "x$NO_MINETEST_GAME" = "x" ]; then
|
|
|
- cd games
|
|
|
- [ -d $GAME_NAME ] && (cd $GAME_NAME && git pull) || (git clone -b $GAME_BRANCH $GAME_GIT)
|
|
|
- cd ..
|
|
|
-fi
|
|
|
+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/bin/*.dll | tr ' ' ';')
|
|
|
vorbis_dlls=$(echo $libdir/libvorbis/bin/libvorbis{,file}-*.dll | tr ' ' ';')
|
|
|
gettext_dlls=$(echo $libdir/gettext/bin/lib{intl,iconv}-*.dll | tr ' ' ';')
|
|
|
|
|
|
-# Build the thing
|
|
|
-[ -d _build ] && rm -Rf _build/
|
|
|
-mkdir _build
|
|
|
-cd _build
|
|
|
-cmake .. \
|
|
|
+cmake -S $sourcedir -B . \
|
|
|
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
|
|
|
-DCMAKE_INSTALL_PREFIX=/tmp \
|
|
|
-DVERSION_EXTRA=$git_hash \
|
|
@@ -160,7 +159,7 @@ cmake .. \
|
|
|
|
|
|
make -j$(nproc)
|
|
|
|
|
|
-[ "x$NO_PACKAGE" = "x" ] && make package
|
|
|
+[ -z "$NO_PACKAGE" ] && make package
|
|
|
|
|
|
exit 0
|
|
|
# EOF
|