externals: Use upstream zlib

We don't need to depend on a custom fork for this. We can add the
library as is, and then make it excluded from the ALL target, so we only
link in the libraries that we actually make use of.
This commit is contained in:
Lioncash
2019-10-03 22:53:03 -04:00
parent 9aac7fbc22
commit 80bdb44ead
4 changed files with 10 additions and 9 deletions
+2 -1
View File
@@ -11,4 +11,5 @@ ninja
ccache -s
ctest -VV -C Release
# Ignore zlib's tests, since they aren't gated behind a CMake option.
ctest -VV -E "(example|example64)" -C Release
+1 -1
View File
@@ -51,4 +51,4 @@
url = https://github.com/DarkLordZach/libzip
[submodule "zlib"]
path = externals/zlib
url = https://github.com/DarkLordZach/zlib
url = https://github.com/madler/zlib
+3 -3
View File
@@ -77,12 +77,12 @@ if (ENABLE_VULKAN)
add_subdirectory(sirit)
endif()
# zlib
add_subdirectory(zlib EXCLUDE_FROM_ALL)
# libzip
add_subdirectory(libzip)
# zlib
add_subdirectory(zlib)
if (ENABLE_WEB_SERVICE)
# LibreSSL
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
+1 -1