master #6

Merged
BRNSystems merged 85 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-09 17:53:52 +01:00
2 changed files with 0 additions and 6 deletions
Showing only changes of commit 62c6667b0b - Show all commits

@ -53,8 +53,6 @@ download "http://minetest.kitsunemimi.pw/openal-soft-$openal_version-win32.zip"
# Set source dir, downloading Minetest as needed # Set source dir, downloading Minetest as needed
get_sources get_sources
git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
# Build the thing # Build the thing
cd $builddir cd $builddir
[ -d build ] && rm -rf build [ -d build ] && rm -rf build
@ -62,7 +60,6 @@ cd $builddir
cmake_args=( cmake_args=(
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file -DCMAKE_TOOLCHAIN_FILE=$toolchain_file
-DCMAKE_INSTALL_PREFIX=/tmp -DCMAKE_INSTALL_PREFIX=/tmp
-DVERSION_EXTRA=$git_hash
-DBUILD_CLIENT=1 -DBUILD_SERVER=0 -DBUILD_CLIENT=1 -DBUILD_SERVER=0
-DEXTRA_DLL="$runtime_dlls" -DEXTRA_DLL="$runtime_dlls"

@ -50,8 +50,6 @@ download "http://minetest.kitsunemimi.pw/openal-soft-$openal_version-win64.zip"
# Set source dir, downloading Minetest as needed # Set source dir, downloading Minetest as needed
get_sources get_sources
git_hash=$(cd $sourcedir && git rev-parse --short HEAD)
# Build the thing # Build the thing
cd $builddir cd $builddir
[ -d build ] && rm -rf build [ -d build ] && rm -rf build
@ -59,7 +57,6 @@ cd $builddir
cmake_args=( cmake_args=(
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file -DCMAKE_TOOLCHAIN_FILE=$toolchain_file
-DCMAKE_INSTALL_PREFIX=/tmp -DCMAKE_INSTALL_PREFIX=/tmp
-DVERSION_EXTRA=$git_hash
-DBUILD_CLIENT=1 -DBUILD_SERVER=0 -DBUILD_CLIENT=1 -DBUILD_SERVER=0
-DEXTRA_DLL="$runtime_dlls" -DEXTRA_DLL="$runtime_dlls"