diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-06 15:58:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 15:58:48 +0100 |
| commit | a225ba4cda6a5e38af6cd7464d19754506152ec9 (patch) | |
| tree | 3506ce99ec9730d6ae08e593c0c7a4979d9e8ce2 /src | |
| parent | Merge pull request #9387 from abouvier/cmake-libusb (diff) | |
| parent | cmake: use sdl2 imported target (diff) | |
| download | yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.gz yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.bz2 yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.lz yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.xz yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.tar.zst yuzu-a225ba4cda6a5e38af6cd7464d19754506152ec9.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/input_common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/yuzu_cmd/CMakeLists.txt | 8 |
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) target_compile_definitions(audio_core PRIVATE -DHAVE_CUBEB=1) endif() if(ENABLE_SDL2) - if (YUZU_USE_EXTERNAL_SDL2) - target_link_libraries(audio_core PRIVATE SDL2-static) - else() - target_link_libraries(audio_core PRIVATE SDL2) - endif() + target_link_libraries(audio_core PRIVATE SDL2::SDL2) target_compile_definitions(audio_core PRIVATE HAVE_SDL2) endif() 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) drivers/sdl_driver.cpp drivers/sdl_driver.h ) - if (YUZU_USE_EXTERNAL_SDL2) - target_link_libraries(input_common PRIVATE SDL2-static) - else() - target_link_libraries(input_common PRIVATE SDL2) - endif() + target_link_libraries(input_common PRIVATE SDL2::SDL2) target_compile_definitions(input_common PRIVATE HAVE_SDL2) endif() 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) endif() if (ENABLE_SDL2) - if (YUZU_USE_EXTERNAL_SDL2) - target_link_libraries(yuzu PRIVATE SDL2-static) - else() - target_link_libraries(yuzu PRIVATE SDL2) - endif() + target_link_libraries(yuzu PRIVATE SDL2::SDL2) target_compile_definitions(yuzu PRIVATE HAVE_SDL2) endif() 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) create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) -target_link_libraries(yuzu-cmd PRIVATE Vulkan::Headers) - -if (YUZU_USE_EXTERNAL_SDL2) - target_link_libraries(yuzu-cmd PRIVATE SDL2-static) -else() - target_link_libraries(yuzu-cmd PRIVATE SDL2) -endif() +target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers) if(UNIX AND NOT APPLE) install(TARGETS yuzu-cmd) |