diff options
| author | bunnei <bunneidev@gmail.com> | 2021-12-18 10:00:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 10:00:17 +0100 |
| commit | 1490b49fa92e33b10beea0826f8af807967b4ffe (patch) | |
| tree | e4aef03ba07c968d1b96e3370ce47197948b5242 | |
| parent | Merge pull request #7302 from VPeruS/check-deadlock (diff) | |
| parent | externals/SDL: update SDL to version with Wayland build fix (diff) | |
| download | yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.tar yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.tar.gz yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.tar.bz2 yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.tar.lz yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.tar.xz yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.tar.zst yuzu-1490b49fa92e33b10beea0826f8af807967b4ffe.zip | |
| -rw-r--r-- | externals/CMakeLists.txt | 7 | ||||
| m--------- | externals/SDL | 0 |
2 files changed, 4 insertions, 3 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 64d1e6aec..491f213d2 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -52,11 +52,12 @@ endif() # SDL2 if (YUZU_USE_EXTERNAL_SDL2) if (NOT WIN32) - # Yuzu itself needs: Events Joystick Haptic Sensor Timers Audio + # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers + # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095) # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen) set(SDL_UNUSED_SUBSYSTEMS - Atomic Render Power Threads - File CPUinfo Filesystem Locale) + CPUinfo File Filesystem + Locale Power Render) foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS}) string(TOUPPER ${_SUB} _OPT) option(SDL_${_OPT} "" OFF) diff --git a/externals/SDL b/externals/SDL -Subproject 2e9821423a237a1206e3c09020778faacfe430b +Subproject e2ade2bfc46d915cd306c63c830b81d800b2575 |