From 1cb6866de4609a22693eb0b78d907a69db3aa40e Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Tue, 1 Oct 2024 00:27:11 -0500 Subject: [PATCH] Revert "Allow shared zlib-ng" This reverts commit 6dad8f837285c32720efa8fcd28de4d197f27611. Our bundled zlib-ng uses zlib compat mode, making it override system zlib. System zlib-ng will not, and all its functions will be prefixed with zng_. Therefore the two aren't actually compatible. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 674839af57..636d5473e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,7 +672,7 @@ dolphin_make_imported_target_if_missing(LibLZMA::LibLZMA LIBLZMA) dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Externals/zstd) -dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng) +add_subdirectory(Externals/zlib-ng) dolphin_find_optional_system_library_pkgconfig(MINIZIP "minizip>=4.0.4" minizip::minizip Externals/minizip-ng