octo
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9379 from liamwhite/cmake-mess 

yuzu-cmd: link SDL2 correctly
This commit is contained in:
Narr the Reg 2022-12-04 11:10:09 -06:00 committed by GitHub
parent f4b5570e7c 0cbfdf7ecb
commit 919b4acfea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
externals/CMakeLists.txt vendored
View File

@ -69,7 +69,6 @@ if (YUZU_USE_EXTERNAL_SDL2)
endif() endif()
add_subdirectory(SDL EXCLUDE_FROM_ALL) add_subdirectory(SDL EXCLUDE_FROM_ALL)
target_link_directories(SDL2-static INTERFACE "${SDL2_BINARY_DIR}")
endif() endif()
# ENet # ENet

2
src/yuzu_cmd/CMakeLists.txt
View File

@ -38,7 +38,7 @@ target_link_libraries(yuzu-cmd PRIVATE inih glad)
if (MSVC) if (MSVC)
target_link_libraries(yuzu-cmd PRIVATE getopt) target_link_libraries(yuzu-cmd PRIVATE getopt)
endif() endif()
target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads) target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon") create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR}) target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})