diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-05-09 04:38:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 04:38:28 -0400 |
| commit | f2b76284ed5174c8c36b40f1bccaa6f66f9876c0 (patch) | |
| tree | 021b5b619e60cdf2ab7b19be0fe53482281e054f | |
| parent | 72a49c2bbcce46c24b6d8ee0592989a507dcd68a (diff) | |
| parent | b021e09fc097d2669c9e80bb3198977c725bc646 (diff) | |
Merge pull request #6292 from lat9nq/sdl-trunk
externals: Update SDL to 107db2d8
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 3 | ||||
| m--------- | externals/SDL | 0 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 054be094d..c8e9ebf8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -292,7 +292,7 @@ if (ENABLE_SDL2) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") else() - find_package(SDL2 2.0.14 QUIET) + find_package(SDL2 2.0.15 QUIET) if (SDL2_FOUND) # Some installations don't set SDL2_LIBRARIES @@ -305,7 +305,7 @@ if (ENABLE_SDL2) add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") else() - message(STATUS "SDL2 2.0.14 or newer not found, falling back to externals.") + message(STATUS "SDL2 2.0.15 or newer not found, falling back to externals.") endif() endif() endif() 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) # SDL2 if (NOT SDL2_FOUND AND ENABLE_SDL2) + set(SDL_STATIC ON) + set(SDL_SHARED OFF) add_subdirectory(SDL EXCLUDE_FROM_ALL) + add_library(SDL2 ALIAS SDL2-static) endif() # SoundTouch diff --git a/externals/SDL b/externals/SDL -Subproject 4cd981609b50ed273d80c635c1ca4c1e5518fb2 +Subproject 107db2d89953ee7cc03417d43da1f26bd03aad5 |