diff options
| -rw-r--r-- | CMakeModules/Findinih.cmake | 27 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | externals/inih/CMakeLists.txt | 13 | ||||
| m--------- | externals/inih/inih | 0 | ||||
| -rw-r--r-- | src/android/app/src/main/jni/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/CMakeLists.txt | 2 |
6 files changed, 2 insertions, 47 deletions
diff --git a/CMakeModules/Findinih.cmake b/CMakeModules/Findinih.cmake deleted file mode 100644 index 791befebd..000000000 --- a/CMakeModules/Findinih.cmake +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf> | ||
| 2 | # | ||
| 3 | # SPDX-License-Identifier: GPL-3.0-or-later | ||
| 4 | |||
| 5 | find_package(PkgConfig QUIET) | ||
| 6 | pkg_search_module(INIH QUIET IMPORTED_TARGET inih) | ||
| 7 | if (INIReader IN_LIST inih_FIND_COMPONENTS) | ||
| 8 | pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader) | ||
| 9 | if (INIREADER_FOUND) | ||
| 10 | set(inih_INIReader_FOUND TRUE) | ||
| 11 | endif() | ||
| 12 | endif() | ||
| 13 | |||
| 14 | include(FindPackageHandleStandardArgs) | ||
| 15 | find_package_handle_standard_args(inih | ||
| 16 | REQUIRED_VARS INIH_LINK_LIBRARIES | ||
| 17 | VERSION_VAR INIH_VERSION | ||
| 18 | HANDLE_COMPONENTS | ||
| 19 | ) | ||
| 20 | |||
| 21 | if (inih_FOUND AND NOT TARGET inih::inih) | ||
| 22 | add_library(inih::inih ALIAS PkgConfig::INIH) | ||
| 23 | endif() | ||
| 24 | |||
| 25 | if (inih_FOUND AND inih_INIReader_FOUND AND NOT TARGET inih::INIReader) | ||
| 26 | add_library(inih::INIReader ALIAS PkgConfig::INIREADER) | ||
| 27 | endif() | ||
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d0d4926bb..515e3f2a4 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -34,11 +34,6 @@ endif() | |||
| 34 | # Glad | 34 | # Glad |
| 35 | add_subdirectory(glad) | 35 | add_subdirectory(glad) |
| 36 | 36 | ||
| 37 | # inih | ||
| 38 | if (NOT TARGET inih::INIReader) | ||
| 39 | add_subdirectory(inih) | ||
| 40 | endif() | ||
| 41 | |||
| 42 | # mbedtls | 37 | # mbedtls |
| 43 | add_subdirectory(mbedtls) | 38 | add_subdirectory(mbedtls) |
| 44 | target_include_directories(mbedtls PUBLIC ./mbedtls/include) | 39 | target_include_directories(mbedtls PUBLIC ./mbedtls/include) |
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 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2014 Gui Andrade <admin@archshift.com> | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 4 | add_library(inih | ||
| 5 | inih/ini.c | ||
| 6 | inih/ini.h | ||
| 7 | inih/cpp/INIReader.cpp | ||
| 8 | inih/cpp/INIReader.h | ||
| 9 | ) | ||
| 10 | |||
| 11 | create_target_directory_groups(inih) | ||
| 12 | target_include_directories(inih INTERFACE inih/cpp) | ||
| 13 | 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/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index 49ad029aa..2acc93da8 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 SHARED | |||
| 22 | 22 | ||
| 23 | set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR}) | 23 | set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR}) |
| 24 | 24 | ||
| 25 | target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad inih jnigraphics log) | ||
| 26 | target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common) | 25 | target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common) |
| 26 | target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log) | ||
| 27 | if (ARCHITECTURE_arm64) | 27 | if (ARCHITECTURE_arm64) |
| 28 | target_link_libraries(yuzu-android PRIVATE adrenotools) | 28 | target_link_libraries(yuzu-android PRIVATE adrenotools) |
| 29 | endif() | 29 | endif() |
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index 281e0658e..fbeba8813 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt | |||
| @@ -30,8 +30,8 @@ add_executable(yuzu-cmd | |||
| 30 | 30 | ||
| 31 | create_target_directory_groups(yuzu-cmd) | 31 | create_target_directory_groups(yuzu-cmd) |
| 32 | 32 | ||
| 33 | target_link_libraries(yuzu-cmd PRIVATE inih::INIReader glad) | ||
| 34 | target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common) | 33 | target_link_libraries(yuzu-cmd PRIVATE common core input_common frontend_common) |
| 34 | target_link_libraries(yuzu-cmd PRIVATE glad) | ||
| 35 | if (MSVC) | 35 | if (MSVC) |
| 36 | target_link_libraries(yuzu-cmd PRIVATE getopt) | 36 | target_link_libraries(yuzu-cmd PRIVATE getopt) |
| 37 | endif() | 37 | endif() |