[cmake] sdl3 ci, fixup cpmfile defs, fix sdl headers

Signed-off-by: crueter <crueter@eden-emu.dev>

CMakeLists.txt

@@ -391,9 +391,6 @@ if (PLATFORM_LINUX OR CXX_CLANG)
     endif()
 endif()
 
-# Other presets, e.g. steamdeck
-set(YUZU_SYSTEM_PROFILE "generic" CACHE STRING "CMake and Externals profile to use. One of: generic, steamdeck")
-
 # Configure C++ standard
 # ===========================
 
@@ -586,8 +583,8 @@ if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
     find_package(oaknut)
 endif()
 
-if (ENABLE_SDL2)
-    find_package(SDL2)
+if (ENABLE_SDL3)
+    find_package(SDL3)
 endif()
 
 if (USE_DISCORD_PRESENCE)

externals/CMakeLists.txt

@@ -134,6 +134,9 @@ if (ENABLE_SDL3)
         endif()
 
         AddJsonPackage(sdl3)
+
+        # annoying
+        target_include_directories(SDL3_Headers INTERFACE ${SDL3_SOURCE_DIR}/include/SDL3)
     elseif (YUZU_USE_BUNDLED_SDL3)
         message(STATUS "Using bundled SDL3")
         AddJsonPackage(sdl3-ci)

externals/cpmfile.json

@@ -159,10 +159,12 @@
         "ci": true,
         "package": "SDL3",
         "name": "SDL3",
-        "repo": "libsdl-org/SDL3",
-        "version": "3.2.22",
+        "repo": "crueter-ci/SDL3",
+        "version": "3.2.24",
         "min_version": "3.2.12",
-        "cmake_filename": "sdl3"
+        "disabled_platforms": [
+            "macos-universal"
+        ]
     },
     "catch2": {
         "package": "Catch2",

src/audio_core/CMakeLists.txt

@@ -254,6 +254,10 @@ if (ENABLE_SDL3)
     )
 
     target_link_libraries(audio_core PRIVATE SDL3::SDL3)
+    if (TARGET SDL3::Headers)
+        target_link_libraries(audio_core PRIVATE SDL3::Headers)
+    endif()
+
     target_compile_definitions(audio_core PRIVATE HAVE_SDL3)
 endif()
 

src/audio_core/sink/sdl3_sink.cpp

@@ -60,8 +60,8 @@ public:
 
             if (devices) {
                 for (int i = 0; i < count; ++i) {
-                    const char* name = SDL_GetAudioDeviceName(devices[i]);
-                    if (name && device_name == name) {
+                    const char* devname = SDL_GetAudioDeviceName(devices[i]);
+                    if (devname && device_name == devname) {
                         device_id = devices[i];
                         break;
                     }
@@ -280,4 +280,4 @@ u32 GetSDLLatency() {
     return TargetSampleCount * 2;
 }
 
-} // namespace AudioCore::Sink
+} // namespace AudioCore::Sink