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.9.0 (#14944)" (#14959)

Browse source 
This reverts commit ebaf3c8d77.
This commit is contained in:
rubenwardy 2024-08-11 19:18:11 +01:00 • committed by GitHub
parent 1222750c50
commit c6c2c4f60f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 20 additions and 13 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

4
util/buildbot/common.sh
View file

@ -15,6 +15,7 @@ zlib_version=1.3.1
zstd_version=1.5.5
libjpeg_version=3.0.1
libpng_version=1.6.40
sdl2_version=2.30.3
download () {
local url=$1
@ -87,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/buildbot/sha256sums.txt
View file

@ -19,6 +19,8 @@ da6ad10632cf172992158e9ea0977a87914b5d5de93a972c3430b6a412237556 luajit-2024012
2b1dabe83d478b398cf9226d96de7fa62c973365c4aea70d27ba5782fb49d2d0 luajit-20240125-win64.zip
e2443451fe5c2066eb564c64b8a1762738a88b7fd749c8b5907fed45c785497b openal-soft-1.23.1-win32.zip
cb041445a118469caefbad2647470cb8571c8337bce2adc07634011ab5625417 openal-soft-1.23.1-win64.zip
574e0847e622ff09ab23e2b22b77685a2ab6ee43de3e2932f3e8a14a4d7b9338 sdl2-2.30.3-win32.zip
6127afdfc7b6a4ade8caf9a7267748ffea974f729866dd5be96c7a69d2f0fee7 sdl2-2.30.3-win64.zip
326701086a0ed66e09a9f3ec4d971654c13b6bd79cfdd079c947ecdcd6409525 sqlite3-3.44.2-win32.zip
b2d474e3625f8f426b6cc5c0ecac831a1de46f7d1027bf4a9f6267b0b0411d42 sqlite3-3.44.2-win64.zip
8af10515d57dbfee5d2106cd66cafa2adeb4270d4c6047ccbf7e8b5d2d50681c zlib-1.3.1-win32.zip

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
)