diff options
| author |  Morph | 2021-05-09 04:38:28 -0400 |
|---|---|---|
| committer |  GitHub | 2021-05-09 04:38:28 -0400 |
| commit | f2b76284ed5174c8c36b40f1bccaa6f66f9876c0 (patch) | |
| tree | 021b5b619e60cdf2ab7b19be0fe53482281e054f /externals | |
| parent | Update SDL2 to SDL2-2.0.15-prerelease. (diff) | |
| parent | externals: Use SDL2 statically (diff) | |
| download | yuzu-f2b76284ed5174c8c36b40f1bccaa6f66f9876c0.tar.gz yuzu-f2b76284ed5174c8c36b40f1bccaa6f66f9876c0.tar.xz yuzu-f2b76284ed5174c8c36b40f1bccaa6f66f9876c0.zip | |
Merge pull request #6292 from lat9nq/sdl-trunk
externals: Update SDL to 107db2d8
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 3 | ||||
| m--------- | externals/SDL | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e044d9730..e280e53d7 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -47,7 +47,10 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include) | |||
| 47 | 47 | ||
| 48 | # SDL2 | 48 | # SDL2 |
| 49 | if (NOT SDL2_FOUND AND ENABLE_SDL2) | 49 | if (NOT SDL2_FOUND AND ENABLE_SDL2) |
| 50 | set(SDL_STATIC ON) | ||
| 51 | set(SDL_SHARED OFF) | ||
| 50 | add_subdirectory(SDL EXCLUDE_FROM_ALL) | 52 | add_subdirectory(SDL EXCLUDE_FROM_ALL) |
| 53 | add_library(SDL2 ALIAS SDL2-static) | ||
| 51 | endif() | 54 | endif() |
| 52 | 55 | ||
| 53 | # SoundTouch | 56 | # SoundTouch |
diff --git a/externals/SDL b/externals/SDL | |||
| Subproject 4cd981609b50ed273d80c635c1ca4c1e5518fb2 | Subproject 107db2d89953ee7cc03417d43da1f26bd03aad5 | ||