minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-06-28 06:11:44 +02:00
Code Issues Releases Wiki Activity

Centralize IrrlichtMt version used for builds

Browse Source 
maybe a submodule would have really been easier...
This commit is contained in:
sfan5
2022-07-21 20:51:02 +02:00
parent 71f6a5f44e
commit 175e132576
7 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/buildbot/buildwin32.sh
View File

@ -8,7 +8,7 @@ GAME_GIT=https://github.com/minetest/minetest_game
GAME_BRANCH=master
GAME_NAME=minetest_game
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ $# -ne 1 ]; then
echo "Usage: $0 <build directory>"
exit 1
@ -28,7 +28,7 @@ if [ -z "$compiler" ]; then
echo "Unable to determine which MinGW compiler to use"
exit 1
fi
toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file"
# Try to find runtime DLLs in various paths (varies by distribution, sigh)
@ -45,7 +45,7 @@ done
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
# Get stuff
irrlicht_version=1.9.0mt7
irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt)
ogg_version=1.3.5
openal_version=1.21.1
vorbis_version=1.3.7

6
util/buildbot/buildwin64.sh
View File

@ -8,7 +8,7 @@ GAME_GIT=https://github.com/minetest/minetest_game
GAME_BRANCH=master
GAME_NAME=minetest_game
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
topdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ $# -ne 1 ]; then
echo "Usage: $0 <build directory>"
exit 1
@ -28,7 +28,7 @@ if [ -z "$compiler" ]; then
echo "Unable to determine which MinGW compiler to use"
exit 1
fi
toolchain_file=$dir/toolchain_${compiler/-gcc/}.cmake
toolchain_file=$topdir/toolchain_${compiler/-gcc/}.cmake
echo "Using $toolchain_file"
# Try to find runtime DLLs in various paths (varies by distribution, sigh)
@ -45,7 +45,7 @@ done
echo "The compiler runtime DLLs could not be found, they might be missing in the final package."
# Get stuff
irrlicht_version=1.9.0mt7
irrlicht_version=$(cat $topdir/../../misc/irrlichtmt_tag.txt)
ogg_version=1.3.5
openal_version=1.21.1
vorbis_version=1.3.7

3
util/ci/common.sh
View File

@ -10,7 +10,8 @@ install_linux_deps() {
if [[ "$1" == "--no-irr" ]]; then
shift
else
wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt7/ubuntu-bionic.tar.gz"
local ver=$(cat misc/irrlichtmt_tag.txt)
wget "https://github.com/minetest/irrlicht/releases/download/$ver/ubuntu-bionic.tar.gz"
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
fi