diff options
| author | 2019-04-28 18:41:39 -0400 | |
|---|---|---|
| committer | 2019-09-30 17:18:38 -0400 | |
| commit | 84b605901299c9a8ea01d461109580710cabfb48 (patch) | |
| tree | 213f54db0bf5048f0b1e40913247e0d8b9566861 | |
| parent | Merge pull request #2923 from yuzu-emu/revert-2574-dynarmic-jit-nullptr (diff) | |
| download | yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.gz yuzu-84b605901299c9a8ea01d461109580710cabfb48.tar.xz yuzu-84b605901299c9a8ea01d461109580710cabfb48.zip | |
externals: Add zlib and libzip libraries to handle ZIP file parsing
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 6 | ||||
| m--------- | externals/libzip | 0 | ||||
| m--------- | externals/zlib | 0 |
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 @@ | |||
| 46 | [submodule "sirit"] | 46 | [submodule "sirit"] |
| 47 | path = externals/sirit | 47 | path = externals/sirit |
| 48 | url = https://github.com/ReinUsesLisp/sirit | 48 | url = https://github.com/ReinUsesLisp/sirit |
| 49 | [submodule "libzip"] | ||
| 50 | path = externals/libzip | ||
| 51 | url = https://github.com/DarkLordZach/libzip | ||
| 52 | [submodule "zlib"] | ||
| 53 | path = externals/zlib | ||
| 54 | 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) | |||
| 77 | add_subdirectory(sirit) | 77 | add_subdirectory(sirit) |
| 78 | endif() | 78 | endif() |
| 79 | 79 | ||
| 80 | # libzip | ||
| 81 | add_subdirectory(libzip) | ||
| 82 | |||
| 83 | # zlib | ||
| 84 | add_subdirectory(zlib) | ||
| 85 | |||
| 80 | if (ENABLE_WEB_SERVICE) | 86 | if (ENABLE_WEB_SERVICE) |
| 81 | # LibreSSL | 87 | # LibreSSL |
| 82 | set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") | 88 | 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 | |||