Pārlūkot izejas kodu

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.
Lioncash 6 gadi atpakaļ
vecāks
revīzija
80bdb44ead
4 mainītis faili ar 10 papildinājumiem un 9 dzēšanām
  1. 2 1
      .ci/scripts/linux/docker.sh
  2. 4 4
      .gitmodules
  3. 3 3
      externals/CMakeLists.txt
  4. 1 1
      externals/zlib

+ 2 - 1
.ci/scripts/linux/docker.sh

@@ -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

+ 4 - 4
.gitmodules

@@ -47,8 +47,8 @@
     path = externals/sirit
     url = https://github.com/ReinUsesLisp/sirit
 [submodule "libzip"]
-	path = externals/libzip
-	url = https://github.com/DarkLordZach/libzip
+    path = externals/libzip
+    url = https://github.com/DarkLordZach/libzip
 [submodule "zlib"]
-	path = externals/zlib
-	url = https://github.com/DarkLordZach/zlib
+    path = externals/zlib
+    url = https://github.com/madler/zlib

+ 3 - 3
externals/CMakeLists.txt

@@ -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
externals/zlib

@@ -1 +1 @@
-Subproject commit 094ed57db392170130bc710293568de7b576306d
+Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f