summaryrefslogtreecommitdiffstats
path: root/externals
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-10-04 04:53:03 +0200
committerLioncash <mathew1800@gmail.com>2019-10-04 11:01:57 +0200
commit80bdb44ead002e37eec935fb905c604e7d7a1d43 (patch)
tree953c9e9244ccba2f9209a881a11d23f4a2a22136 /externals
parentMerge pull request #2539 from DarkLordZach/bcat (diff)
downloadyuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.gz
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.bz2
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.lz
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.xz
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.tar.zst
yuzu-80bdb44ead002e37eec935fb905c604e7d7a1d43.zip
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)
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 "")
diff --git a/externals/zlib b/externals/zlib
-Subproject 094ed57db392170130bc710293568de7b576306
+Subproject cacf7f1d4e3d44d871b605da3b647f07d718623