diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-05-21 22:21:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-21 22:21:56 +0200 |
| commit | 35ee08ba9fd0425d019bc0ef0054cad6b0fab52f (patch) | |
| tree | 050e22f04d8a5faf6f29787bc8783ceaed24c72d /CMakeLists.txt | |
| parent | 5c2f73986a97a94a3f9f0eb5a9c77725e5e1c68e (diff) | |
| parent | cd25e91ca28e94d8e7c48c45710a4bd795ec1fa0 (diff) | |
Merge pull request #12736 from mitaclaw/minizip-ng-update
Externals: Update minizip-ng to 4.0.5 and convert to submodule
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f8e845d0f..b71bcd0ec6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -674,9 +674,9 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng) -# https://github.com/zlib-ng/minizip-ng/commit/6c5f265a55f1a12a7a016cd2962feff91cff5d2e -add_definitions(-DMZ_COMPAT_VERSION=110) # This macro is for forwards compatibility with 4.0.4+ -dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::minizip Externals/minizip) +dolphin_find_optional_system_library_pkgconfig(MINIZIP + "minizip-ng>=4.0.4;minizip>=4.0.4" minizip::minizip Externals/minizip-ng +) dolphin_find_optional_system_library(LZO Externals/LZO) |