summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar liamwhite2022-12-06 09:58:48 -0500
committerGravatar GitHub2022-12-06 09:58:48 -0500
commita225ba4cda6a5e38af6cd7464d19754506152ec9 (patch)
tree3506ce99ec9730d6ae08e593c0c7a4979d9e8ce2 /src
parentMerge pull request #9387 from abouvier/cmake-libusb (diff)
parentcmake: use sdl2 imported target (diff)
downloadyuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.gz
yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.xz
yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.zip
Merge pull request #9391 from abouvier/cmake-sdl
cmake: use sdl2 imported target
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/CMakeLists.txt6
-rw-r--r--src/input_common/CMakeLists.txt6
-rw-r--r--src/yuzu/CMakeLists.txt6
-rw-r--r--src/yuzu_cmd/CMakeLists.txt8
4 files changed, 4 insertions, 22 deletions
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index f573a23e6..420ba62e0 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -227,11 +227,7 @@ if(ENABLE_CUBEB)
227 target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1) 227 target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1)
228endif() 228endif()
229if(ENABLE_SDL2) 229if(ENABLE_SDL2)
230 if (YUZU_USE_EXTERNAL_SDL2) 230 target_link_libraries(audio_core PRIVATE SDL2::SDL2)
231 target_link_libraries(audio_core PRIVATE SDL2-static)
232 else()
233 target_link_libraries(audio_core PRIVATE SDL2)
234 endif()
235 target_compile_definitions(audio_core PRIVATE HAVE_SDL2) 231 target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
236endif() 232endif()
237 233
diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt
index 2c9e1d359..7932aaab0 100644
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@@ -56,11 +56,7 @@ if (ENABLE_SDL2)
56 drivers/sdl_driver.cpp 56 drivers/sdl_driver.cpp
57 drivers/sdl_driver.h 57 drivers/sdl_driver.h
58 ) 58 )
59 if (YUZU_USE_EXTERNAL_SDL2) 59 target_link_libraries(input_common PRIVATE SDL2::SDL2)
60 target_link_libraries(input_common PRIVATE SDL2-static)
61 else()
62 target_link_libraries(input_common PRIVATE SDL2)
63 endif()
64 target_compile_definitions(input_common PRIVATE HAVE_SDL2) 60 target_compile_definitions(input_common PRIVATE HAVE_SDL2)
65endif() 61endif()
66 62
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index 9971bdfab..d23eb2907 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -391,11 +391,7 @@ if (YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_LESS 6)
391endif() 391endif()
392 392
393if (ENABLE_SDL2) 393if (ENABLE_SDL2)
394 if (YUZU_USE_EXTERNAL_SDL2) 394 target_link_libraries(yuzu PRIVATE SDL2::SDL2)
395 target_link_libraries(yuzu PRIVATE SDL2-static)
396 else()
397 target_link_libraries(yuzu PRIVATE SDL2)
398 endif()
399 target_compile_definitions(yuzu PRIVATE HAVE_SDL2) 395 target_compile_definitions(yuzu PRIVATE HAVE_SDL2)
400endif() 396endif()
401 397
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 19b1d258c..f6eeb9d8d 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -43,13 +43,7 @@ target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
43create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") 43create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
44target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) 44target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
45 45
46target_link_libraries(yuzu-cmd PRIVATE Vulkan::Headers) 46target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)
47
48if (YUZU_USE_EXTERNAL_SDL2)
49 target_link_libraries(yuzu-cmd PRIVATE SDL2-static)
50else()
51 target_link_libraries(yuzu-cmd PRIVATE SDL2)
52endif()
53 47
54if(UNIX AND NOT APPLE) 48if(UNIX AND NOT APPLE)
55 install(TARGETS yuzu-cmd) 49 install(TARGETS yuzu-cmd)