summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2021-04-16 19:12:47 -0400
committerGravatar lat9nq2021-04-16 19:12:47 -0400
commit12e58917c0280ef8dcb2e94cd9a02bac03c3d27a (patch)
tree057653e34546b3055e653e48847642526c727d01
parentMerge pull request #6201 from bunnei/remove-bintray (diff)
downloadyuzu-12e58917c0280ef8dcb2e94cd9a02bac03c3d27a.tar.gz
yuzu-12e58917c0280ef8dcb2e94cd9a02bac03c3d27a.tar.xz
yuzu-12e58917c0280ef8dcb2e94cd9a02bac03c3d27a.zip
externals: Add SDL 2.0.12
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.
-rw-r--r--.gitmodules3
-rw-r--r--CMakeLists.txt20
-rw-r--r--externals/CMakeLists.txt6
m---------externals/SDL0
4 files changed, 20 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index a0a89933d..829ab46fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
40[submodule "ffmpeg"] 40[submodule "ffmpeg"]
41 path = externals/ffmpeg 41 path = externals/ffmpeg
42 url = https://git.ffmpeg.org/ffmpeg.git 42 url = https://git.ffmpeg.org/ffmpeg.git
43[submodule "externals/SDL"]
44 path = externals/SDL
45 url = https://github.com/libsdl-org/SDL.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4a6da2e1..e208715d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,17 +274,19 @@ if (ENABLE_SDL2)
274 target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") 274 target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
275 target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") 275 target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
276 else() 276 else()
277 find_package(SDL2 REQUIRED) 277 find_package(SDL2 2.0.12)
278 278
279 # Some installations don't set SDL2_LIBRARIES 279 if(SDL2_FOUND)
280 if("${SDL2_LIBRARIES}" STREQUAL "") 280 # Some installations don't set SDL2_LIBRARIES
281 message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2") 281 if("${SDL2_LIBRARIES}" STREQUAL "")
282 set(SDL2_LIBRARIES "SDL2::SDL2") 282 message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
283 endif() 283 set(SDL2_LIBRARIES "SDL2::SDL2")
284 endif()
284 285
285 include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) 286 include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
286 add_library(SDL2 INTERFACE) 287 add_library(SDL2 INTERFACE)
287 target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") 288 target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
289 endif()
288 endif() 290 endif()
289else() 291else()
290 set(SDL2_FOUND NO) 292 set(SDL2_FOUND NO)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 891a47c3c..6e4591b4e 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -45,6 +45,12 @@ target_include_directories(microprofile INTERFACE ./microprofile)
45add_library(unicorn-headers INTERFACE) 45add_library(unicorn-headers INTERFACE)
46target_include_directories(unicorn-headers INTERFACE ./unicorn/include) 46target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
47 47
48# SDL2
49if (NOT SDL2_FOUND)
50 set(SDL2_FOUND YES)
51 add_subdirectory(SDL EXCLUDE_FROM_ALL)
52endif()
53
48# SoundTouch 54# SoundTouch
49add_subdirectory(soundtouch) 55add_subdirectory(soundtouch)
50 56
diff --git a/externals/SDL b/externals/SDL
new file mode 160000
Subproject 983bbf9ef3e572a073a6f5877faf1c0b4803527