-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Andrew Udvare <[email protected]>
- Loading branch information
Showing
2 changed files
with
21 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,31 @@ | ||
From 8aa392b07418fe8be95be0d5f61b33aaeedd80f8 Mon Sep 17 00:00:00 2001 | ||
From 829dc5f006802069b2dc5ccd1cb58c854552714a Mon Sep 17 00:00:00 2001 | ||
From: Andrew Udvare <[email protected]> | ||
Date: Sun, 30 Oct 2022 22:55:47 -0400 | ||
Subject: [PATCH 2/2] inih fix | ||
|
||
--- | ||
src/citra/CMakeLists.txt | 6 +----- | ||
src/citra/config.cpp | 1 + | ||
src/video_core/renderer_vulkan/vk_shader_util.cpp | 2 +- | ||
2 files changed, 2 insertions(+), 1 deletion(-) | ||
3 files changed, 3 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt | ||
index 498b77027..d78d65e76 100644 | ||
--- a/src/citra/CMakeLists.txt | ||
+++ b/src/citra/CMakeLists.txt | ||
@@ -22,11 +22,7 @@ create_target_directory_groups(citra) | ||
|
||
target_link_libraries(citra PRIVATE citra_common citra_core input_common network) | ||
target_link_libraries(citra PRIVATE glad) | ||
-if (NOT USE_SYSTEM_INIH) | ||
- target_link_libraries(citra PRIVATE inih) | ||
-else() | ||
- target_link_libraries(citra PRIVATE ${INIH_LIBS}) | ||
-endif() | ||
+target_link_libraries(citra PRIVATE inih) | ||
if (MSVC) | ||
target_link_libraries(citra PRIVATE getopt) | ||
endif() | ||
diff --git a/src/citra/config.cpp b/src/citra/config.cpp | ||
index 1cbcf0262..4e773f60d 100644 | ||
--- a/src/citra/config.cpp | ||
|