mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-14 13:27:45 -07:00
Revert "Allow shared zlib-ng"
This reverts commit 6dad8f8372
.
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.
This commit is contained in:
parent
c7cbac538a
commit
1cb6866de4
@ -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(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
|
dolphin_find_optional_system_library_pkgconfig(MINIZIP
|
||||||
"minizip>=4.0.4" minizip::minizip Externals/minizip-ng
|
"minizip>=4.0.4" minizip::minizip Externals/minizip-ng
|
||||||
|
Loading…
Reference in New Issue
Block a user