From 899b4aaeec32ee2ddca806c9989c80c7a1668bb0 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Tue, 15 Oct 2024 13:19:05 -0700 Subject: [PATCH] Use system SDL by default since we don't properly support building with just builtin SDL --- .ci/build-linux.sh | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 7e594b1c5e..ff061cd7e3 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -42,6 +42,7 @@ cmake .. \ -DCMAKE_RANLIB="$RANLIB" \ -DUSE_SYSTEM_CURL=ON \ -DUSE_SDL=ON \ + -DUSE_SYSTEM_SDL=ON \ -DUSE_SYSTEM_FFMPEG=OFF \ -DUSE_DISCORD_RPC=ON \ -DOpenGL_GL_PREFERENCE=LEGACY \ diff --git a/CMakeLists.txt b/CMakeLists.txt index a399501734..8b95d4a838 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON) option(USE_VULKAN "Vulkan render backend" ON) option(USE_PRECOMPILED_HEADERS "Use precompiled headers" OFF) option(USE_SDL "Enables SDL input handler" OFF) -option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" OFF) +option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" ON) option(USE_SYSTEM_FFMPEG "Prefer system ffmpeg instead of the prebuild one" OFF) option(USE_SYSTEM_OPENAL "Prefer system OpenAL instead of the prebuild one" ON) option(USE_SYSTEM_CURL "Prefer system Curl instead of the prebuild one" ON)