mirrors-yuzu-emu/yuzu-mainline
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-mainline synced 2024-11-22 09:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

externals: Use upstream zlib

Browse source 
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
Show stats 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

8
.gitmodules vendored
View file

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

6
externals/CMakeLists.txt vendored
View file

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

2
externals/zlib vendored

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