summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-04-20 19:19:03 +0200
committerGitHub <noreply@github.com>2021-04-20 19:19:03 +0200
commit7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2 (patch)
tree0c80f17141b77304f932b7eaecd5834d22845700 /externals
parentMerge pull request #6217 from Morph1984/consistent-writebuffers (diff)
parentgeneral: Ignore implicit-fallthrough for SDL.h (diff)
downloadyuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar
yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.gz
yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.bz2
yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.lz
yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.xz
yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.zst
yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.zip
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt3
m---------externals/SDL0
2 files changed, 1 insertions, 2 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 6e4591b4e..e044d9730 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -46,8 +46,7 @@ add_library(unicorn-headers INTERFACE)
target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
# SDL2
-if (NOT SDL2_FOUND)
- set(SDL2_FOUND YES)
+if (NOT SDL2_FOUND AND ENABLE_SDL2)
add_subdirectory(SDL EXCLUDE_FROM_ALL)
endif()
diff --git a/externals/SDL b/externals/SDL
-Subproject 983bbf9ef3e572a073a6f5877faf1c0b4803527
+Subproject 4cd981609b50ed273d80c635c1ca4c1e5518fb2