summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Morph2022-11-29 19:41:47 -0500
committerGravatar GitHub2022-11-29 19:41:47 -0500
commit49219b8a864f0176a52486e5a33cc443f91e8f97 (patch)
tree1b655d4b25ff251d75ebbd829f3541999616e4cc /src
parentMerge pull request #9308 from lat9nq/from-scratch (diff)
parentCMake: Directly link to SDL2-static when appropriate (diff)
downloadyuzu-49219b8a864f0176a52486e5a33cc443f91e8f97.tar.gz
yuzu-49219b8a864f0176a52486e5a33cc443f91e8f97.tar.xz
yuzu-49219b8a864f0176a52486e5a33cc443f91e8f97.zip
Merge pull request #9349 from lat9nq/cmake-322
CMakeLists: Bump minimum required CMake version to 3.22
Diffstat (limited to '')
-rw-r--r--src/audio_core/CMakeLists.txt6
-rw-r--r--src/input_common/CMakeLists.txt6
-rw-r--r--src/yuzu/CMakeLists.txt6
3 files changed, 15 insertions, 3 deletions
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index 8e3a8f5a8..75416c53a 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -226,6 +226,10 @@ if(ENABLE_CUBEB)
226 target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1) 226 target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1)
227endif() 227endif()
228if(ENABLE_SDL2) 228if(ENABLE_SDL2)
229 target_link_libraries(audio_core PRIVATE SDL2) 229 if (YUZU_USE_EXTERNAL_SDL2)
230 target_link_libraries(audio_core PRIVATE SDL2-static)
231 else()
232 target_link_libraries(audio_core PRIVATE SDL2)
233 endif()
230 target_compile_definitions(audio_core PRIVATE HAVE_SDL2) 234 target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
231endif() 235endif()
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index cc6f0ffc0..193127d0a 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -55,7 +55,11 @@ if (ENABLE_SDL2)
55 drivers/sdl_driver.cpp 55 drivers/sdl_driver.cpp
56 drivers/sdl_driver.h 56 drivers/sdl_driver.h
57 ) 57 )
58 target_link_libraries(input_common PRIVATE SDL2) 58 if (YUZU_USE_EXTERNAL_SDL2)
59 target_link_libraries(input_common PRIVATE SDL2-static)
60 else()
61 target_link_libraries(input_common PRIVATE SDL2)
62 endif()
59 target_compile_definitions(input_common PRIVATE HAVE_SDL2) 63 target_compile_definitions(input_common PRIVATE HAVE_SDL2)
60endif() 64endif()
61 65
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 0aa109dd3..060de0259 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -387,7 +387,11 @@ if (YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_LESS 6)
387endif() 387endif()
388 388
389if (ENABLE_SDL2) 389if (ENABLE_SDL2)
390 target_link_libraries(yuzu PRIVATE SDL2) 390 if (YUZU_USE_EXTERNAL_SDL2)
391 target_link_libraries(yuzu PRIVATE SDL2-static)
392 else()
393 target_link_libraries(yuzu PRIVATE SDL2)
394 endif()
391 target_compile_definitions(yuzu PRIVATE HAVE_SDL2) 395 target_compile_definitions(yuzu PRIVATE HAVE_SDL2)
392endif() 396endif()
393 397