diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-04-18 05:35:13 +0200 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-04-18 05:42:57 +0200 |
| commit | de69a5266fde93a793fc3664db205ec7bad3e9a9 (patch) | |
| tree | 6d14faea4a91e9cd8e5a516712b677354a92a41b | |
| parent | Merge pull request #6204 from lat9nq/sdl2-external (diff) | |
| download | yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.gz yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.bz2 yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.lz yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.xz yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.tar.zst yuzu-de69a5266fde93a793fc3664db205ec7bad3e9a9.zip | |
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 3 | ||||
| m--------- | externals/SDL | 0 | ||||
| -rw-r--r-- | src/input_common/CMakeLists.txt | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e208715d7..2c1c3d560 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,9 +274,9 @@ if (ENABLE_SDL2) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") else() - find_package(SDL2 2.0.12) + find_package(SDL2 2.0.14) - if(SDL2_FOUND) + 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") @@ -286,10 +286,10 @@ if (ENABLE_SDL2) include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) 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.") endif() endif() -else() - set(SDL2_FOUND NO) endif() # Install any missing dependencies with conan install diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 6e4591b4e..e044d9730 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -46,8 +46,7 @@ add_library(unicorn-headers INTERFACE) target_include_directories(unicorn-headers INTERFACE ./unicorn/include) # SDL2 -if (NOT SDL2_FOUND) - set(SDL2_FOUND YES) +if (NOT SDL2_FOUND AND ENABLE_SDL2) add_subdirectory(SDL EXCLUDE_FROM_ALL) endif() diff --git a/externals/SDL b/externals/SDL -Subproject 983bbf9ef3e572a073a6f5877faf1c0b4803527 +Subproject 4cd981609b50ed273d80c635c1ca4c1e5518fb2 diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index c3cfe7efc..de53e1fda 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -62,7 +62,7 @@ else() ) endif() -if(SDL2_FOUND) +if (ENABLE_SDL2) target_sources(input_common PRIVATE sdl/sdl_impl.cpp sdl/sdl_impl.h |