Disable SDL2 for 5.10.0 (#15284)

see #14545
2025-10-31 15:35:21 +01:00 · 2024-10-14 22:09:11 +02:00
parent 6431ef7324
commit 6d7a519740
9 changed files with 12 additions and 16 deletions
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -42,7 +42,6 @@ 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
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -42,7 +42,6 @@ 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
--- a/util/buildbot/common.sh
+++ b/util/buildbot/common.sh
@@ -88,9 +88,6 @@ 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