summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-11-25 04:59:55 +0100
committerGitHub <noreply@github.com>2023-11-25 04:59:55 +0100
commit5a182f4e7ccfac696cd54542089c880d002f5cc9 (patch)
treee1bcd72f38f4f57ff6b915022268b0feb86a7937 /externals
parentMerge pull request #12140 from liamwhite/qcr-unreachable (diff)
parentfrontend_common: Don't specify default value for screenshot_path (diff)
downloadyuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.tar
yuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.tar.gz
yuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.tar.bz2
yuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.tar.lz
yuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.tar.xz
yuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.tar.zst
yuzu-5a182f4e7ccfac696cd54542089c880d002f5cc9.zip
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt8
-rw-r--r--externals/inih/CMakeLists.txt13
m---------externals/inih/inih0
m---------externals/simpleini0
4 files changed, 3 insertions, 18 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index be8b0b5e8..515e3f2a4 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -34,11 +34,6 @@ endif()
# Glad
add_subdirectory(glad)
-# inih
-if (NOT TARGET inih::INIReader)
- add_subdirectory(inih)
-endif()
-
# mbedtls
add_subdirectory(mbedtls)
target_include_directories(mbedtls PUBLIC ./mbedtls/include)
@@ -295,3 +290,6 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB)
endif()
endif()
+
+# SimpleIni
+add_subdirectory(simpleini)
diff --git a/externals/inih/CMakeLists.txt b/externals/inih/CMakeLists.txt
deleted file mode 100644
index ebb60a976..000000000
--- a/externals/inih/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: 2014 Gui Andrade <admin@archshift.com>
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-add_library(inih
- inih/ini.c
- inih/ini.h
- inih/cpp/INIReader.cpp
- inih/cpp/INIReader.h
-)
-
-create_target_directory_groups(inih)
-target_include_directories(inih INTERFACE inih/cpp)
-add_library(inih::INIReader ALIAS inih)
diff --git a/externals/inih/inih b/externals/inih/inih
deleted file mode 160000
-Subproject 9cecf0643da0846e77f64d10a126d9f48b9e05e
diff --git a/externals/simpleini b/externals/simpleini
new file mode 160000
+Subproject 382ddbb4b92c0b26aa1b32cefba2002119a5b1f