Ribbit/ribbitvulkanadditions
1
0
Fork 0
forked from eden-emu/eden
Code Pull requests Activity

Merge pull request #2940 from lioncash/zlib

Browse source 
externals: Track mainline zlib as a submodule
This commit is contained in:
bunnei 2019-10-04 15:44:13 -04:00 • committed by GitHub
commit accdb84993
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.ci/scripts/linux/docker.sh
View file

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

2
.gitmodules vendored
View file

@ -51,4 +51,4 @@
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

8
externals/CMakeLists.txt vendored
View file

@ -77,11 +77,11 @@ if (ENABLE_VULKAN)
add_subdirectory(sirit) add_subdirectory(sirit)
endif() endif()
# libzip
add_subdirectory(libzip)
# zlib # zlib
add_subdirectory(zlib) add_subdirectory(zlib EXCLUDE_FROM_ALL)
# libzip
add_subdirectory(libzip EXCLUDE_FROM_ALL)
if (ENABLE_WEB_SERVICE) if (ENABLE_WEB_SERVICE)
# LibreSSL # LibreSSL

2
externals/zlib vendored

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