summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd
diff options
context:
space:
mode:
authorGravatar liamwhite2022-12-05 12:26:09 -0500
committerGravatar GitHub2022-12-05 12:26:09 -0500
commit3b19f741bd6a19f603858e6cdf8db41516c7075f (patch)
treeb81c29eed062f83a3f01161710b00d5d531e666b /src/yuzu_cmd
parentMerge pull request #9383 from FernandoS27/poke-great (diff)
parentcmake: prefer system libraries (diff)
downloadyuzu-3b19f741bd6a19f603858e6cdf8db41516c7075f.tar.gz
yuzu-3b19f741bd6a19f603858e6cdf8db41516c7075f.tar.xz
yuzu-3b19f741bd6a19f603858e6cdf8db41516c7075f.zip
Merge pull request #6833 from abouvier/unbundle
cmake: prefer system libraries
Diffstat (limited to 'src/yuzu_cmd')
-rw-r--r--src/yuzu_cmd/CMakeLists.txt4
-rw-r--r--src/yuzu_cmd/config.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 1c0c1a9fe..19b1d258c 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -34,7 +34,7 @@ add_executable(yuzu-cmd
34create_target_directory_groups(yuzu-cmd) 34create_target_directory_groups(yuzu-cmd)
35 35
36target_link_libraries(yuzu-cmd PRIVATE common core input_common) 36target_link_libraries(yuzu-cmd PRIVATE common core input_common)
37target_link_libraries(yuzu-cmd PRIVATE inih glad) 37target_link_libraries(yuzu-cmd PRIVATE inih::INIReader glad)
38if (MSVC) 38if (MSVC)
39 target_link_libraries(yuzu-cmd PRIVATE getopt) 39 target_link_libraries(yuzu-cmd PRIVATE getopt)
40endif() 40endif()
@@ -43,7 +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_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include) 46target_link_libraries(yuzu-cmd PRIVATE Vulkan::Headers)
47 47
48if (YUZU_USE_EXTERNAL_SDL2) 48if (YUZU_USE_EXTERNAL_SDL2)
49 target_link_libraries(yuzu-cmd PRIVATE SDL2-static) 49 target_link_libraries(yuzu-cmd PRIVATE SDL2-static)
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 59f9c8e09..2c78e776c 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -15,7 +15,7 @@
15#pragma clang diagnostic pop 15#pragma clang diagnostic pop
16#endif 16#endif
17 17
18#include <inih/cpp/INIReader.h> 18#include <INIReader.h>
19#include "common/fs/file.h" 19#include "common/fs/file.h"
20#include "common/fs/fs.h" 20#include "common/fs/fs.h"
21#include "common/fs/path_util.h" 21#include "common/fs/path_util.h"