summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
authorGravatar Lioncash2019-10-03 22:53:03 -0400
committerGravatar Lioncash2019-10-04 05:01:57 -0400
commit80bdb44ead002e37eec935fb905c604e7d7a1d43 (patch)
tree953c9e9244ccba2f9209a881a11d23f4a2a22136 /externals
parentMerge pull request #2539 from DarkLordZach/bcat (diff)
downloadyuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.gz
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.xz
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.zip
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.
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt6
m---------externals/zlib0
2 files changed, 3 insertions, 3 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d797d9fc9..d6815fbc5 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -77,12 +77,12 @@ if (ENABLE_VULKAN)
77 add_subdirectory(sirit) 77 add_subdirectory(sirit)
78endif() 78endif()
79 79
80# zlib
81add_subdirectory(zlib EXCLUDE_FROM_ALL)
82
80# libzip 83# libzip
81add_subdirectory(libzip) 84add_subdirectory(libzip)
82 85
83# zlib
84add_subdirectory(zlib)
85
86if (ENABLE_WEB_SERVICE) 86if (ENABLE_WEB_SERVICE)
87 # LibreSSL 87 # LibreSSL
88 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") 88 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
diff --git a/externals/zlib b/externals/zlib
Subproject 094ed57db392170130bc710293568de7b576306 Subproject cacf7f1d4e3d44d871b605da3b647f07d718623