flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

externals: Add SDL 2.0.12

Browse source 
Since Bintray is (soon to be) no more, there needs to be a way to
acquire SDL2. Since 20.04's version is older than our minimum required
version (2.0.12), add it as an external.
This commit is contained in:
lat9nq 2021-04-16 19:12:47 -04:00
parent bb32a4a8d7
commit 12e58917c0
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -40,3 +40,6 @@
[submodule "ffmpeg"] [submodule "ffmpeg"]
path = externals/ffmpeg path = externals/ffmpeg
url = https://git.ffmpeg.org/ffmpeg.git url = https://git.ffmpeg.org/ffmpeg.git
[submodule "externals/SDL"]
path = externals/SDL
url = https://github.com/libsdl-org/SDL.git

4
CMakeLists.txt
View file

@ -274,8 +274,9 @@ if (ENABLE_SDL2)
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
else() else()
find_package(SDL2 REQUIRED) find_package(SDL2 2.0.12)
if(SDL2_FOUND)
# Some installations don't set SDL2_LIBRARIES # Some installations don't set SDL2_LIBRARIES
if("${SDL2_LIBRARIES}" STREQUAL "") if("${SDL2_LIBRARIES}" STREQUAL "")
message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
@ -286,6 +287,7 @@ if (ENABLE_SDL2)
add_library(SDL2 INTERFACE) add_library(SDL2 INTERFACE)
target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
endif() endif()
endif()
else() else()
set(SDL2_FOUND NO) set(SDL2_FOUND NO)
endif() endif()

6
externals/CMakeLists.txt vendored
View file

@ -45,6 +45,12 @@ target_include_directories(microprofile INTERFACE ./microprofile)
add_library(unicorn-headers INTERFACE) add_library(unicorn-headers INTERFACE)
target_include_directories(unicorn-headers INTERFACE ./unicorn/include) 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 # SoundTouch
add_subdirectory(soundtouch) add_subdirectory(soundtouch)

1
externals/SDL vendored Submodule

@ -0,0 +1 @@
Subproject commit 983bbf9ef3e572a073a6f5877faf1c0b4803527c