Merge pull request #6204 from lat9nq/sdl2-external
externals: Add SDL 2.0.12
This commit is contained in:
commit
2a2a578932
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -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 "SDL"]
|
||||||
|
path = externals/SDL
|
||||||
|
url = https://github.com/libsdl-org/SDL.git
|
||||||
|
@ -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
6
externals/CMakeLists.txt
vendored
@ -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
1
externals/SDL
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 983bbf9ef3e572a073a6f5877faf1c0b4803527c
|
Loading…
Reference in New Issue
Block a user