From 790e3f3e09ec86967ad56261257bd211fd7dc424 Mon Sep 17 00:00:00 2001 From: Kaydax Date: Fri, 15 May 2026 16:19:22 -0400 Subject: [PATCH] Remove useless steamdeck variant --- CMakeLists.txt | 4 ---- externals/CMakeLists.txt | 9 ++------- externals/cpmfile.json | 13 ++----------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e215d6126f..3f479196da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -358,10 +358,6 @@ if (CXX_GCC OR CXX_CLANG) endif() endif() -# Other presets, e.g. steamdeck -# TODO(crueter): Just have every Linux/Windows use old sdl2 -set(YUZU_SYSTEM_PROFILE "generic" CACHE STRING "CMake and Externals profile to use. One of: generic, steamdeck") - # Configure C++ standard # =========================== diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index fc518a1af3..189670db02 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -158,18 +158,13 @@ if (NOT ANDROID) set(SDL_FILE ON) endif() - if ("${YUZU_SYSTEM_PROFILE}" STREQUAL "steamdeck") - set(SDL_PIPEWIRE OFF) # build errors out with this on - AddJsonPackage("sdl3_steamdeck") - else() - AddJsonPackage("sdl3_generic") - endif() + AddJsonPackage("sdl3") elseif (YUZU_USE_BUNDLED_SDL3) message(STATUS "Using bundled SDL3") if (PLATFORM_FREEBSD) set(BUILD_SHARED_LIBS ON) endif() - AddJsonPackage(sdl3) + AddJsonPackage(sdl3-ci) endif() find_package(SDL3 3.4 REQUIRED) diff --git a/externals/cpmfile.json b/externals/cpmfile.json index 977377c17f..c9f45cca26 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -123,7 +123,7 @@ "BUNDLE_SPEEX ON" ] }, - "sdl3": { + "sdl3-ci": { "ci": true, "package": "SDL3", "name": "SDL3", @@ -157,7 +157,7 @@ "find_args": "MODULE", "git_version": "4.25" }, - "sdl3_generic": { + "sdl3": { "package": "SDL3", "repo": "libsdl-org/SDL", "tag": "release-%VERSION%", @@ -166,15 +166,6 @@ "git_version": "3.4.8", "skip_updates": true }, - "sdl3_steamdeck": { - "package": "SDL3", - "repo": "libsdl-org/SDL", - "tag": "release-%VERSION%", - "hash": "df5a323af7ac366661a3c0e887969c72584d232f3cc211419d59b0487b620b6b2859d4549c9e8df002ee489290062e466fcfddf7edc0872a37b1f2845e81c0f3", - "git_version": "3.4.8", - "bundled": true, - "skip_updates": true - }, "moltenvk": { "repo": "V380-Ori/Ryujinx.MoltenVK", "tag": "v%VERSION%-ryujinx",