Merge pull request #6292 from lat9nq/sdl-trunk

externals: Update SDL to 107db2d8

CMakeLists.txt

@@ -292,7 +292,7 @@ if (ENABLE_SDL2)
         target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}")
         target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
     else()
-        find_package(SDL2 2.0.14 QUIET)
+        find_package(SDL2 2.0.15 QUIET)
 
         if (SDL2_FOUND)
             # Some installations don't set SDL2_LIBRARIES
@@ -305,7 +305,7 @@ if (ENABLE_SDL2)
             add_library(SDL2 INTERFACE)
             target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
         else()
-            message(STATUS "SDL2 2.0.14 or newer not found, falling back to externals.")
+            message(STATUS "SDL2 2.0.15 or newer not found, falling back to externals.")
         endif()
     endif()
 endif()

externals/CMakeLists.txt

@@ -47,7 +47,10 @@ target_include_directories(unicorn-headers INTERFACE ./unicorn/include)
 
 # SDL2
 if (NOT SDL2_FOUND AND ENABLE_SDL2)
+    set(SDL_STATIC ON)
+    set(SDL_SHARED OFF)
     add_subdirectory(SDL EXCLUDE_FROM_ALL)
+    add_library(SDL2 ALIAS SDL2-static)
 endif()
 
 # SoundTouch

externals/SDL

@@ -1 +1 @@
-Subproject commit 4cd981609b50ed273d80c635c1ca4c1e5518fb21
+Subproject commit 107db2d89953ee7cc03417d43da1f26bd03aad57