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:
@@ -11,4 +11,5 @@ ninja
|
|||||||
|
|
||||||
ccache -s
|
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
|
||||||
|
|||||||
+4
-4
@@ -47,8 +47,8 @@
|
|||||||
path = externals/sirit
|
path = externals/sirit
|
||||||
url = https://github.com/ReinUsesLisp/sirit
|
url = https://github.com/ReinUsesLisp/sirit
|
||||||
[submodule "libzip"]
|
[submodule "libzip"]
|
||||||
path = externals/libzip
|
path = externals/libzip
|
||||||
url = https://github.com/DarkLordZach/libzip
|
url = https://github.com/DarkLordZach/libzip
|
||||||
[submodule "zlib"]
|
[submodule "zlib"]
|
||||||
path = externals/zlib
|
path = externals/zlib
|
||||||
url = https://github.com/DarkLordZach/zlib
|
url = https://github.com/madler/zlib
|
||||||
|
|||||||
Vendored
+3
-3
@@ -77,12 +77,12 @@ if (ENABLE_VULKAN)
|
|||||||
add_subdirectory(sirit)
|
add_subdirectory(sirit)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# zlib
|
||||||
|
add_subdirectory(zlib EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
# libzip
|
# libzip
|
||||||
add_subdirectory(libzip)
|
add_subdirectory(libzip)
|
||||||
|
|
||||||
# zlib
|
|
||||||
add_subdirectory(zlib)
|
|
||||||
|
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
# LibreSSL
|
# LibreSSL
|
||||||
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
|
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
|
||||||
|
|||||||
Vendored
+1
-1
Submodule externals/zlib updated: 094ed57db3...cacf7f1d4e
Reference in New Issue
Block a user