INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-28 11:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6833 from abouvier/unbundle

Browse Source 
cmake: prefer system libraries
This commit is contained in:
liamwhite
2022-12-05 12:26:09 -05:00
committed by GitHub
parent c7f32300b2 8e17b5469f
commit 3b19f741bd
18 changed files with 209 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/yuzu_cmd/CMakeLists.txt
View File

@ -34,7 +34,7 @@ add_executable(yuzu-cmd
create_target_directory_groups(yuzu-cmd)
target_link_libraries(yuzu-cmd PRIVATE common core input_common)
target_link_libraries(yuzu-cmd PRIVATE inih glad)
target_link_libraries(yuzu-cmd PRIVATE inih::INIReader glad)
if (MSVC)
target_link_libraries(yuzu-cmd PRIVATE getopt)
endif()
@ -43,7 +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_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include)
target_link_libraries(yuzu-cmd PRIVATE Vulkan::Headers)
if (YUZU_USE_EXTERNAL_SDL2)
target_link_libraries(yuzu-cmd PRIVATE SDL2-static)

2
src/yuzu_cmd/config.cpp
View File

@ -15,7 +15,7 @@
#pragma clang diagnostic pop
#endif
#include <inih/cpp/INIReader.h>
#include <INIReader.h>
#include "common/fs/file.h"
#include "common/fs/fs.h"
#include "common/fs/path_util.h"