diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-04-17 22:36:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-17 22:36:56 -0400 |
| commit | 2a2a578932cb8e08d804f9c39c2025317860e58e (patch) | |
| tree | 52442360b97b4c382a3af2cb50b0c117fc60e8e9 | |
| parent | ce921e0f2619fc52a70e5545711e284b320328d4 (diff) | |
| parent | b17f031e35a8b8629af809e6e2aec221bce134b3 (diff) | |
Merge pull request #6204 from lat9nq/sdl2-external
externals: Add SDL 2.0.12
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 20 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| m--------- | externals/SDL | 0 |
4 files changed, 20 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index a0a89933df..8e5bc4581d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "ffmpeg"] path = externals/ffmpeg url = https://git.ffmpeg.org/ffmpeg.git +[submodule "SDL"] + path = externals/SDL + url = https://github.com/libsdl-org/SDL.git diff --git a/CMakeLists.txt b/CMakeLists.txt index a4a6da2e19..e208715d77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,17 +274,19 @@ if (ENABLE_SDL2) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") else() - find_package(SDL2 REQUIRED) + find_package(SDL2 2.0.12) - # Some installations don't set SDL2_LIBRARIES - if("${SDL2_LIBRARIES}" STREQUAL "") - message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") - set(SDL2_LIBRARIES "SDL2::SDL2") - endif() + if(SDL2_FOUND) + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") + message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") + set(SDL2_LIBRARIES "SDL2::SDL2") + endif() - include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) - add_library(SDL2 INTERFACE) - target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") + include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") + endif() endif() else() set(SDL2_FOUND NO) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 891a47c3cc..6e4591b4e0 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -45,6 +45,12 @@ target_include_directories(microprofile INTERFACE ./microprofile) add_library(unicorn-headers INTERFACE) target_include_directories(unicorn-headers INTERFACE ./unicorn/include) +# SDL2 +if (NOT SDL2_FOUND) + set(SDL2_FOUND YES) + add_subdirectory(SDL EXCLUDE_FROM_ALL) +endif() + # SoundTouch add_subdirectory(soundtouch) diff --git a/externals/SDL b/externals/SDL new file mode 160000 +Subproject 983bbf9ef3e572a073a6f5877faf1c0b4803527 |