diff options
Diffstat (limited to '')
| -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) | |||
| 292 | target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") | 292 | target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") |
| 293 | target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") | 293 | target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") |
| 294 | else() | 294 | else() |
| 295 | find_package(SDL2 2.0.14 QUIET) | 295 | find_package(SDL2 2.0.15 QUIET) |
| 296 | 296 | ||
| 297 | if (SDL2_FOUND) | 297 | if (SDL2_FOUND) |
| 298 | # Some installations don't set SDL2_LIBRARIES | 298 | # Some installations don't set SDL2_LIBRARIES |
| @@ -305,7 +305,7 @@ if (ENABLE_SDL2) | |||
| 305 | add_library(SDL2 INTERFACE) | 305 | add_library(SDL2 INTERFACE) |
| 306 | target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") | 306 | target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") |
| 307 | else() | 307 | else() |
| 308 | message(STATUS "SDL2 2.0.14 or newer not found, falling back to externals.") | 308 | message(STATUS "SDL2 2.0.15 or newer not found, falling back to externals.") |
| 309 | endif() | 309 | endif() |
| 310 | endif() | 310 | endif() |
| 311 | endif() | 311 | 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) | |||
| 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 | ||