summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorAmeer J <52414509+ameerj@users.noreply.github.com>2023-11-27 03:08:53 +0100
committerGitHub <noreply@github.com>2023-11-27 03:08:53 +0100
commit1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a (patch)
treec219aacab776c0a1e3956614b60a01fa2f6164cb /externals
parentshader_recompiler: Align SSBO offsets in GlobalMemory functions (diff)
parentMerge pull request #11535 from GPUCode/upload_cmdbuf (diff)
downloadyuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar
yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.gz
yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.bz2
yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.lz
yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.xz
yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.zst
yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.zip
Diffstat (limited to '')
-rw-r--r--externals/CMakeLists.txt10
-rw-r--r--externals/inih/CMakeLists.txt13
m---------externals/inih/inih0
m---------externals/simpleini0
4 files changed, 5 insertions, 18 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index be8b0b5e8..fc922c31b 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,8 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB)
endif()
endif()
+
+# SimpleIni
+if (NOT TARGET SimpleIni::SimpleIni)
+ add_subdirectory(simpleini)
+endif()
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