diff --git a/CMakeLists.txt b/CMakeLists.txt index 00a3b39281..36e1378220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -460,9 +460,8 @@ AddJsonPackage(nlohmann) if (NOT YUZU_STATIC_ROOM) # zlib AddJsonPackage(zlib) - - if (ZLIB_ADDED) - add_library(ZLIB::ZLIB ALIAS zlibstatic) + if (NOT TARGET ZLIB::ZLIB) + add_library(ZLIB::ZLIB ALIAS zlib-ng) endif() # Opus diff --git a/cpmfile.json b/cpmfile.json index 5bfb7ebb63..b263e0f035 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -378,16 +378,16 @@ "version": "7.35.2" }, "zlib": { - "hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4", - "min_version": "1.2", + "hash": "e2057c764f1d5aaee738edee7e977182c5b097e3c95489dcd8de813f237d92a05daaa86d68d44b331d9fec5d1802586a8f6cfb658ba849874aaa14e72a8107f5", "options": [ - "ZLIB_BUILD_SHARED OFF", - "ZLIB_INSTALL OFF" + "ZLIB_COMPAT ON", + "ZLIB_ALIASES ON", + "BUILD_SHARED_LIBS OFF" ], "package": "ZLIB", - "repo": "madler/zlib", - "tag": "v%VERSION%", - "version": "1.3.2" + "repo": "zlib-ng/zlib-ng", + "tag": "%VERSION%", + "version": "2.3.3" }, "zstd": { "find_args": "MODULE",