Use SDL2 by default

Except of Android and macOS, for now
minetest · Nov 3, 2023 · b845c5f · b845c5f
1 parent 85081d6
commit b845c5f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake .
+          cmake . -DUSE_SDL2=OFF
           make VERBOSE=1 -j2
 
       - name: Test
@@ -52,7 +52,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=OFF -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)

diff --git a/scripts/ci-build-mingw.sh b/scripts/ci-build-mingw.sh
@@ -40,10 +40,16 @@ tmp=(
 	-DZLIB_LIBRARY=$libs/zlib/lib/libz.dll.a \
 	-DZLIB_INCLUDE_DIR=$libs/zlib/include
 )
-[ $with_sdl -eq 1 ] && tmp+=(
-	-DUSE_SDL2=ON
-	-DCMAKE_PREFIX_PATH=$libs/sdl2/lib/cmake
-)
+if [ $with_sdl -eq 1 ]; then
+	tmp+=(
+		-DUSE_SDL2=ON
+		-DCMAKE_PREFIX_PATH=$libs/sdl2/lib/cmake
+	)
+else
+	tmp+=(
+		-DUSE_SDL2=OFF
+	)
+fi
 #[ $with_gl3 -eq 1 ] && tmp+=(-DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON)
 
 cmake . "${tmp[@]}"

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
@@ -1,5 +1,9 @@
+if(NOT ANDROID AND NOT APPLE)
+	set(DEFAULT_SDL2 ON)
+endif()
+
 option(BUILD_SHARED_LIBS "Build shared library" TRUE)
-option(USE_SDL2 "Use the SDL2 backend" FALSE)
+option(USE_SDL2 "Use the SDL2 backend" ${DEFAULT_SDL2})
 
 # Compiler flags