oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-15 18:57:08 +00:00
Code Wiki Activity

Adjust build config for Irrlicht changes (again)

Browse source
This commit is contained in:
sfan5 2021-03-25 15:09:49 +01:00
parent 298bb3d8f7
commit 6a26d6d15a
6 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/buildbot/buildwin32.sh
View file

@ -31,7 +31,7 @@ if [ -z "$toolchain_file" ]; then
fi
echo "Using $toolchain_file"
irrlicht_version=1.9.0mt0
irrlicht_version=1.9.0mt1
ogg_version=1.3.2
vorbis_version=1.3.5
curl_version=7.65.3
@ -122,8 +122,8 @@ cmake .. \
-DENABLE_FREETYPE=1 \
-DENABLE_LEVELDB=1 \
\
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlicht \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlicht.dll.a \
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \
-DIRRLICHT_DLL="$irr_dlls" \
\
-DZLIB_INCLUDE_DIR=$libdir/zlib/include \

6
util/buildbot/buildwin64.sh
View file

@ -20,7 +20,7 @@ packagedir=$builddir/packages
libdir=$builddir/libs
toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
irrlicht_version=1.9.0mt0
irrlicht_version=1.9.0mt1
ogg_version=1.3.2
vorbis_version=1.3.5
curl_version=7.65.3
@ -112,8 +112,8 @@ cmake .. \
-DENABLE_FREETYPE=1 \
-DENABLE_LEVELDB=1 \
\
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlicht \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlicht.dll.a \
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \
-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \
-DIRRLICHT_DLL="$irr_dlls" \
\
-DZLIB_INCLUDE_DIR=$libdir/zlib/include \

2
util/ci/common.sh
View file

@ -12,7 +12,7 @@ install_linux_deps() {
shift
pkgs+=(libirrlicht-dev)
else
wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt0/ubuntu-bionic.tar.gz"
wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt1/ubuntu-bionic.tar.gz"
sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
fi