diff options
| author |  bunnei | 2021-04-20 10:19:03 -0700 |
|---|---|---|
| committer |  GitHub | 2021-04-20 10:19:03 -0700 |
| commit | 7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2 (patch) | |
| tree | 0c80f17141b77304f932b7eaecd5834d22845700 /externals | |
| parent | Merge pull request #6217 from Morph1984/consistent-writebuffers (diff) | |
| parent | general: Ignore implicit-fallthrough for SDL.h (diff) | |
| download | yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.gz yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.tar.xz yuzu-7083c5bfc8b6990ac9cd0758a452fbd75c15f3d2.zip | |
Merge pull request #6207 from lat9nq/sdl-2.0.14
cmake: Use SDL 2.0.14 and fix scope issue
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 3 | ||||
| m--------- | externals/SDL | 0 |
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) | |||
| 46 | target_include_directories(unicorn-headers INTERFACE ./unicorn/include) | 46 | target_include_directories(unicorn-headers INTERFACE ./unicorn/include) |
| 47 | 47 | ||
| 48 | # SDL2 | 48 | # SDL2 |
| 49 | if (NOT SDL2_FOUND) | 49 | if (NOT SDL2_FOUND AND ENABLE_SDL2) |
| 50 | set(SDL2_FOUND YES) | ||
| 51 | add_subdirectory(SDL EXCLUDE_FROM_ALL) | 50 | add_subdirectory(SDL EXCLUDE_FROM_ALL) |
| 52 | endif() | 51 | endif() |
| 53 | 52 | ||
diff --git a/externals/SDL b/externals/SDL | |||
| Subproject 983bbf9ef3e572a073a6f5877faf1c0b4803527 | Subproject 4cd981609b50ed273d80c635c1ca4c1e5518fb2 | ||