diff options
| author |  Ameer J | 2023-11-26 21:08:53 -0500 |
|---|---|---|
| committer |  GitHub | 2023-11-26 21:08:53 -0500 |
| commit | 1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a (patch) | |
| tree | c219aacab776c0a1e3956614b60a01fa2f6164cb /externals/CMakeLists.txt | |
| parent | shader_recompiler: Align SSBO offsets in GlobalMemory functions (diff) | |
| parent | Merge pull request #11535 from GPUCode/upload_cmdbuf (diff) | |
| download | yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.gz yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.tar.xz yuzu-1d11fe00a3000efbf6a0a4bb690e0d544a1b7b4a.zip | |
Merge branch 'master' into ssbo-align
Diffstat (limited to 'externals/CMakeLists.txt')
| -rw-r--r-- | externals/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 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() | |||
| 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) |
| @@ -295,3 +290,8 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client) | |||
| 295 | target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB) | 290 | target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB) |
| 296 | endif() | 291 | endif() |
| 297 | endif() | 292 | endif() |
| 293 | |||
| 294 | # SimpleIni | ||
| 295 | if (NOT TARGET SimpleIni::SimpleIni) | ||
| 296 | add_subdirectory(simpleini) | ||
| 297 | endif() | ||