summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-04-29 00:41:39 +0200
committerZach Hilman <zachhilman@gmail.com>2019-09-30 23:18:38 +0200
commit84b605901299c9a8ea01d461109580710cabfb48 (patch)
tree213f54db0bf5048f0b1e40913247e0d8b9566861
parentMerge pull request #2923 from yuzu-emu/revert-2574-dynarmic-jit-nullptr (diff)
downloadyuzu-84b605901299c9a8ea01d461109580710cabfb48.tar
yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.gz
yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.bz2
yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.lz
yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.xz
yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.zst
yuzu-84b605901299c9a8ea01d461109580710cabfb48.zip
Diffstat (limited to '')
-rw-r--r--.gitmodules6
-rw-r--r--externals/CMakeLists.txt6
m---------externals/libzip0
m---------externals/zlib0
4 files changed, 12 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 3a49c4874..f3051cca0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,9 @@
[submodule "sirit"]
path = externals/sirit
url = https://github.com/ReinUsesLisp/sirit
+[submodule "libzip"]
+ path = externals/libzip
+ url = https://github.com/DarkLordZach/libzip
+[submodule "zlib"]
+ path = externals/zlib
+ url = https://github.com/DarkLordZach/zlib
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index e6fa11a03..d797d9fc9 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -77,6 +77,12 @@ if (ENABLE_VULKAN)
add_subdirectory(sirit)
endif()
+# libzip
+add_subdirectory(libzip)
+
+# zlib
+add_subdirectory(zlib)
+
if (ENABLE_WEB_SERVICE)
# LibreSSL
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
diff --git a/externals/libzip b/externals/libzip
new file mode 160000
+Subproject bebbb54c8e691f019415fcb852ef4d53ebbc500
diff --git a/externals/zlib b/externals/zlib
new file mode 160000
+Subproject 094ed57db392170130bc710293568de7b576306