From 9a439a3646b26b1fceda3e5d70630b0bb4b48aca Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Sun, 17 Dec 2023 20:46:08 +0300 Subject: [PATCH] Use SDL2 by default Except on Android and macOS, for now --- .github/workflows/build.yml | 4 ++-- scripts/ci-build-mingw.sh | 12 ++++++++---- source/Irrlicht/CMakeLists.txt | 6 +++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c4c60a5..bb78eb70 100644 --- 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 index 736969f8..1bafaaa6 100755 --- a/scripts/ci-build-mingw.sh +++ b/scripts/ci-build-mingw.sh @@ -43,10 +43,14 @@ 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 index 630970ae..36b102f0 100644 --- 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