summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar zeltermann2023-06-12 21:06:49 +0700
committerGravatar zeltermann2023-06-12 21:36:07 +0700
commit0c04e27df33056ee9cc4e5e63d36a6099d43210b (patch)
treefa30bf0747fb521170228207c1ac8b0e4f91504e
parentMerge pull request #10718 from liamwhite/buffered-io (diff)
downloadyuzu-0c04e27df33056ee9cc4e5e63d36a6099d43210b.tar.gz
yuzu-0c04e27df33056ee9cc4e5e63d36a6099d43210b.tar.xz
yuzu-0c04e27df33056ee9cc4e5e63d36a6099d43210b.zip
Re-enable SDL's CPUinfo subsystem
See https://github.com/libsdl-org/SDL/issues/7809. Disabling CPUinfo triggers a bug in SDL's audio subsystem, which breaks SDL's JACK output on Linux. We're lucky it hasn't broken anything else.
Diffstat (limited to '')
-rw-r--r--externals/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 500eb21e3..a763e0c32 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -63,8 +63,9 @@ if (YUZU_USE_EXTERNAL_SDL2)
63 # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers 63 # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
64 # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095) 64 # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
65 # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) 65 # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
66 # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
66 set(SDL_UNUSED_SUBSYSTEMS 67 set(SDL_UNUSED_SUBSYSTEMS
67 CPUinfo File Filesystem 68 File Filesystem
68 Locale Power Render) 69 Locale Power Render)
69 foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) 70 foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
70 string(TOUPPER ${_SUB} _OPT) 71 string(TOUPPER ${_SUB} _OPT)