summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Udvare <audvare@gmail.com>2021-12-17 03:49:26 +0100
committerAndrew Udvare <audvare@gmail.com>2021-12-17 15:38:46 +0100
commit9b3611eb8de712c59635747ecd0d33ddb964a032 (patch)
tree0a419a3a19e2544a48da190fea05018840e379db
parentexternals/CMakeLists: fix detection/init of Switch controllers in SDL 2.0.18 (diff)
downloadyuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.tar
yuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.tar.gz
yuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.tar.bz2
yuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.tar.lz
yuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.tar.xz
yuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.tar.zst
yuzu-9b3611eb8de712c59635747ecd0d33ddb964a032.zip
-rw-r--r--externals/CMakeLists.txt8
m---------externals/SDL0
2 files changed, 4 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 598f81978..491f213d2 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -52,12 +52,12 @@ endif()
# SDL2
if (YUZU_USE_EXTERNAL_SDL2)
if (NOT WIN32)
- # Yuzu itself needs: Events Joystick Haptic Sensor Timers Audio Threads Atomic
- # Since 2.0.18 Threads/Atomic required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
+ # 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
- Render Power 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