diff options
| author | 2022-12-04 10:59:58 -0500 | |
|---|---|---|
| committer | 2022-12-04 10:59:58 -0500 | |
| commit | 0cbfdf7ecbb5e73f4fc79e7763018c39dc7cd9aa (patch) | |
| tree | d6b9958e223161972053811114ad3a953d87ee30 | |
| parent | Merge pull request #9375 from jbeich/xbyak-no-install (diff) | |
| download | yuzu-0cbfdf7ecbb5e73f4fc79e7763018c39dc7cd9aa.tar.gz yuzu-0cbfdf7ecbb5e73f4fc79e7763018c39dc7cd9aa.tar.xz yuzu-0cbfdf7ecbb5e73f4fc79e7763018c39dc7cd9aa.zip | |
yuzu-cmd: link SDL2 correctly
| -rw-r--r-- | externals/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d25626ccc..eb6cb706d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -69,7 +69,6 @@ if (YUZU_USE_EXTERNAL_SDL2) | |||
| 69 | endif() | 69 | endif() |
| 70 | 70 | ||
| 71 | add_subdirectory(SDL EXCLUDE_FROM_ALL) | 71 | add_subdirectory(SDL EXCLUDE_FROM_ALL) |
| 72 | target_link_directories(SDL2-static INTERFACE "${SDL2_BINARY_DIR}") | ||
| 73 | endif() | 72 | endif() |
| 74 | 73 | ||
| 75 | # ENet | 74 | # ENet |
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index 607b4e6aa..1c0c1a9fe 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt | |||
| @@ -38,7 +38,7 @@ target_link_libraries(yuzu-cmd PRIVATE inih glad) | |||
| 38 | if (MSVC) | 38 | if (MSVC) |
| 39 | target_link_libraries(yuzu-cmd PRIVATE getopt) | 39 | target_link_libraries(yuzu-cmd PRIVATE getopt) |
| 40 | endif() | 40 | endif() |
| 41 | target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads) | 41 | target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) |
| 42 | 42 | ||
| 43 | create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") | 43 | create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") |
| 44 | target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) | 44 | target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) |