VERY experimental Nintendo Switch 2 emulator
C++
general: Remove inih
t895227c5ecbb135
diff --git a/CMakeModules/Findinih.cmake b/CMakeModules/Findinih.cmakedeleted file mode 100644index 791befebdc..0000000000--- a/CMakeModules/Findinih.cmake+++ /dev/null@@ -1,27 +0,0 @@-# SPDX-FileCopyrightText: 2022 Alexandre Bouvier <[email protected]>-#-# SPDX-License-Identifier: GPL-3.0-or-later--find_package(PkgConfig QUIET)-pkg_search_module(INIH QUIET IMPORTED_TARGET inih)-if (INIReader IN_LIST inih_FIND_COMPONENTS)- pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader)- if (INIREADER_FOUND)- set(inih_INIReader_FOUND TRUE)- endif()-endif()--include(FindPackageHandleStandardArgs)-find_package_handle_standard_args(inih- REQUIRED_VARS INIH_LINK_LIBRARIES- VERSION_VAR INIH_VERSION- HANDLE_COMPONENTS-)--if (inih_FOUND AND NOT TARGET inih::inih)- add_library(inih::inih ALIAS PkgConfig::INIH)-endif()--if (inih_FOUND AND inih_INIReader_FOUND AND NOT TARGET inih::INIReader)- add_library(inih::INIReader ALIAS PkgConfig::INIREADER)-endif()diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txtindex d0d4926bb2..515e3f2a4a 100644--- a/externals/CMakeLists.txt+++ b/externals/CMakeLists.txt@@ -34,11 +34,6 @@ endif()# Gladadd_subdirectory(glad)-# inih-if (NOT TARGET inih::INIReader)- add_subdirectory(inih)-endif()-# mbedtlsadd_subdirectory(mbedtls)target_include_directories(mbedtls PUBLIC ./mbedtls/include)diff --git a/externals/inih/CMakeLists.txt b/externals/inih/CMakeLists.txtdeleted file mode 100644index ebb60a976e..0000000000--- a/externals/inih/CMakeLists.txt+++ /dev/null@@ -1,13 +0,0 @@-# SPDX-FileCopyrightText: 2014 Gui Andrade <[email protected]>-# 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/inihdeleted file mode 160000index 9cecf0643d..0000000000--- a/externals/inih/inih+++ /dev/null@@ -1 +0,0 @@-Subproject commit 9cecf0643da0846e77f64d10a126d9f48b9e05e8diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txtindex 49ad029aa1..2acc93da81 100644--- a/src/android/app/src/main/jni/CMakeLists.txt+++ b/src/android/app/src/main/jni/CMakeLists.txt@@ -22,8 +22,8 @@ add_library(yuzu-android SHAREDset_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})-target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad inih jnigraphics log)target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common)+target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log)if (ARCHITECTURE_arm64)target_link_libraries(yuzu-android PRIVATE adrenotools)endif()diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txtindex 281e0658e2..fbeba88130 100644--- a/src/yuzu_cmd/CMakeLists.txt+++ b/src/yuzu_cmd/CMakeLists.txt@@ -30,8 +30,8 @@ add_executable(yuzu-cmdcreate_target_directory_groups(yuzu-cmd)-target_link_libraries(yuzu-cmd PRIVATE inih::INIReader glad)target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common)+target_link_libraries(yuzu-cmd PRIVATE glad)if (MSVC)target_link_libraries(yuzu-cmd PRIVATE getopt)endif()