oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Revert "Disable SDL2 for 5.10.0 (#15284)"

Browse source 
This reverts commit 6d7a519740.
This commit is contained in:
sfan5 2024-11-10 20:22:02 +01:00
parent 8503d8de5e
commit a5e3fca40c
9 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
util/buildbot/buildwin32.sh
View file

@ -42,6 +42,7 @@ download "$libhost/llvm/libleveldb-$leveldb_version-win32.zip"
download "$libhost/llvm/openal-soft-$openal_version-win32.zip"
download "$libhost/llvm/libjpeg-$libjpeg_version-win32.zip"
download "$libhost/llvm/libpng-$libpng_version-win32.zip"
download "$libhost/llvm/sdl2-$sdl2_version-win32.zip"
# Set source dir, downloading Minetest as needed
get_sources

1
util/buildbot/buildwin64.sh
View file

@ -42,6 +42,7 @@ download "$libhost/llvm/libleveldb-$leveldb_version-win64.zip"
download "$libhost/llvm/openal-soft-$openal_version-win64.zip"
download "$libhost/llvm/libjpeg-$libjpeg_version-win64.zip"
download "$libhost/llvm/libpng-$libpng_version-win64.zip"
download "$libhost/llvm/sdl2-$sdl2_version-win64.zip"
# Set source dir, downloading Minetest as needed
get_sources

3
util/buildbot/common.sh
View file

@ -88,6 +88,9 @@ add_cmake_libs () {
-DJPEG_INCLUDE_DIR=$libdir/libjpeg/include
-DJPEG_DLL="$(_dlls $libdir/libjpeg/bin/libjpeg*)"
-DCMAKE_PREFIX_PATH=$libdir/sdl2/lib/cmake
-DSDL2_DLL="$(_dlls $libdir/sdl2/bin/*)"
-DZLIB_INCLUDE_DIR=$libdir/zlib/include
-DZLIB_LIBRARY=$libdir/zlib/lib/libz.dll.a
-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll

2
util/ci/common.sh
View file

@ -4,7 +4,7 @@
install_linux_deps() {
local pkgs=(
cmake gettext postgresql
libpng-dev libjpeg-dev libgl1-mesa-dev libxi-dev libfreetype-dev
libpng-dev libjpeg-dev libgl1-mesa-dev libsdl2-dev libfreetype-dev
libsqlite3-dev libhiredis-dev libogg-dev libgmp-dev libvorbis-dev
libopenal-dev libpq-dev libleveldb-dev libcurl4-openssl-dev libzstd-dev
)