diff options
| author |  bunnei | 2019-10-04 15:44:13 -0400 |
|---|---|---|
| committer |  GitHub | 2019-10-04 15:44:13 -0400 |
| commit | accdb84993ca8fbb8f69c505dd9a3c5a7064bebf (patch) | |
| tree | 70d77e931f85d83cbc0e9b5fc0a310299d0ab95d /externals | |
| parent | Merge pull request #2898 from FearlessTobi/port-4004 (diff) | |
| parent | CMakeLists: Make libzip excluded from the ALL target (diff) | |
| download | yuzu-accdb84993ca8fbb8f69c505dd9a3c5a7064bebf.tar.gz yuzu-accdb84993ca8fbb8f69c505dd9a3c5a7064bebf.tar.xz yuzu-accdb84993ca8fbb8f69c505dd9a3c5a7064bebf.zip | |
Merge pull request #2940 from lioncash/zlib
externals: Track mainline zlib as a submodule
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 8 | ||||
| m--------- | externals/zlib | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d797d9fc9..3539828b8 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -77,11 +77,11 @@ 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 | 80 | # zlib |
| 84 | add_subdirectory(zlib) | 81 | add_subdirectory(zlib EXCLUDE_FROM_ALL) |
| 82 | |||
| 83 | # libzip | ||
| 84 | add_subdirectory(libzip EXCLUDE_FROM_ALL) | ||
| 85 | 85 | ||
| 86 | if (ENABLE_WEB_SERVICE) | 86 | if (ENABLE_WEB_SERVICE) |
| 87 | # LibreSSL | 87 | # LibreSSL |
diff --git a/externals/zlib b/externals/zlib | |||
| Subproject 094ed57db392170130bc710293568de7b576306 | Subproject cacf7f1d4e3d44d871b605da3b647f07d718623 | ||