Fix requiring system SDL2 when we can use bundled

RPCS3 · Oct 12, 2024 · 8c784d2 · 8c784d2
1 parent fed7eb5
commit 8c784d2
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 54 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -218,40 +218,46 @@ add_subdirectory(asmjit EXCLUDE_FROM_ALL)
 # OpenAL
 add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
 
+# SDL2
+set(SDL2_TARGET 3rdparty_dummy_lib)
+if(USE_SDL)
+	if(USE_SYSTEM_SDL)
+		find_package(SDL2)
+		if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.24.0)
+			message(STATUS "Using system SDL2")
+			add_library(3rdparty_sdl2 INTERFACE)
+			target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
+			target_include_directories(3rdparty_sdl2 INTERFACE ${SDL2_INCLUDE_DIRS})
+			set(SDL2_TARGET 3rdparty_sdl2)
+		else()
+			message(FATAL_ERROR "SDL2 is not available on this system")
+		endif()
+	else()
+		message(STATUS "Using static SDL2 from 3rdparty")
+		add_library(3rdparty_sdl2 INTERFACE)
+		target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
+		target_include_directories(3rdparty_sdl2 INTERFACE ${SDL2_INCLUDE_DIRS})
+		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
+		set(SDL2_TARGET 3rdparty_sdl2)
+	endif()
+endif()
+
 # FAudio
 set(FAUDIO_TARGET 3rdparty_dummy_lib)
-if(USE_FAUDIO)
-	# FAudio depends on SDL2
-	find_package(SDL2)
+if(USE_FAUDIO AND SDL2_TARGET)
 	if (USE_SYSTEM_FAUDIO)
-		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.12)
-			message(WARNING
-				"RPCS3: System FAudio requires SDL 2.0.9 or newer. Please note, this warning"
-				"can also be displayed with SDL2 versions between 2.0.9-2.0.12, as the"
-				"CMake config files are not correctly installed. Since a valid SDL2"
-				">=2.0.9 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled using system FAudio with SDL < 2.0.12" FORCE)
-		else()
-			message(STATUS "RPCS3: Using system FAudio")
-			find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
-			add_library(3rdparty_FAudio INTERFACE)
-			target_link_libraries(3rdparty_FAudio INTERFACE FAudio)
-			target_compile_definitions(3rdparty_FAudio INTERFACE -DHAVE_FAUDIO)
-			set(FAUDIO_TARGET 3rdparty_FAudio)
-		endif()
+		message(STATUS "RPCS3: Using system FAudio")
+		find_package(FAudio REQUIRED CONFIGS FAudioConfig.cmake FAudio-config.cmake)
+		add_library(3rdparty_FAudio INTERFACE)
+		target_link_libraries(3rdparty_FAudio INTERFACE FAudio)
+		target_compile_definitions(3rdparty_FAudio INTERFACE -DHAVE_FAUDIO)
+		set(FAUDIO_TARGET 3rdparty_FAudio)
 	else()
-		if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.24.0)
-			message(WARNING
-				"-- RPCS3: 3rdparty FAudio requires SDL 2.24.0 or newer. Since a valid SDL2"
-				">=2.24.0 version cannot be found, building with FAudio will be skipped.")
-			set(USE_FAUDIO OFF CACHE BOOL "Disabled FAudio with SDL < 2.24.0" FORCE)
-		else()
-			message(STATUS "RPCS3: Using builtin FAudio")
-			set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
-			add_subdirectory(FAudio EXCLUDE_FROM_ALL)
-			target_compile_definitions(FAudio-static INTERFACE -DHAVE_FAUDIO)
-			set(FAUDIO_TARGET FAudio-static)
-		endif()
+		message(STATUS "RPCS3: Using builtin FAudio")
+		set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library")
+		add_subdirectory(FAudio EXCLUDE_FROM_ALL)
+		target_compile_definitions(FAudio-static INTERFACE -DHAVE_FAUDIO)
+		set(FAUDIO_TARGET FAudio-static)
 	endif()
 endif()
 
@@ -314,29 +320,6 @@ add_subdirectory(wolfssl EXCLUDE_FROM_ALL)
 # CURL
 add_subdirectory(curl EXCLUDE_FROM_ALL)
 
-# SDL2
-set(SDL2_TARGET 3rdparty_dummy_lib)
-if(USE_SDL)
-	if(USE_SYSTEM_SDL)
-		find_package(SDL2)
-		if(SDL2_FOUND AND NOT SDL2_VERSION VERSION_LESS 2.24.0)
-			message(STATUS "Using system SDL2")
-			add_library(3rdparty_sdl2 INTERFACE)
-			target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
-			target_link_libraries(3rdparty_sdl2 INTERFACE SDL2::SDL2)
-			set(SDL2_TARGET 3rdparty_sdl2)
-		else()
-			message(FATAL_ERROR "SDL2 is not available on this system")
-		endif()
-	else()
-		message(STATUS "Using static SDL2 from 3rdparty")
-		add_library(3rdparty_sdl2 INTERFACE)
-		target_compile_definitions(3rdparty_sdl2 INTERFACE -DHAVE_SDL2=1)
-		add_subdirectory(libsdl-org EXCLUDE_FROM_ALL)
-		set(SDL2_TARGET 3rdparty_sdl2)
-	endif()
-endif()
-
 # MINIUPNP
 add_subdirectory(miniupnp EXCLUDE_FROM_ALL)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ option(USE_DISCORD_RPC "Discord rich presence integration" OFF)
 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_SDL "Enables SDL input handler" ON)
 option(USE_SYSTEM_SDL "Prefer system SDL instead of the builtin one" OFF)
 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)