Skip to content

Commit

Permalink
chore: Unfork zlib (#1339)
Browse files Browse the repository at this point in the history
The issues we had with zlib and CMake have been resolved upstream.
  • Loading branch information
joeyparrish authored Feb 12, 2024
1 parent 9193a90 commit df04d0e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
url = https://github.com/Mbed-TLS/mbedtls
[submodule "packager/third_party/zlib/source"]
path = packager/third_party/zlib/source
url = https://github.com/joeyparrish/zlib
url = https://github.com/madler/zlib
[submodule "packager/third_party/libpng/source"]
path = packager/third_party/libpng/source
url = https://github.com/glennrp/libpng
Expand Down
7 changes: 3 additions & 4 deletions packager/third_party/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
# submodule in an unclean state.
set(RENAME_ZCONF OFF)

# Skip the building of zlib example apps and tests.
set(ZLIB_BUILD_EXAMPLES OFF)

# Don't install anything.
set(SKIP_INSTALL_ALL ON)

# The configuration for x64 assembly in zlib's CMakeLists.txt doesn't seem to
# work, as the assembly files aren't in the repo for some reason. So don't set
# the AMD64 flag.

# With these set in scope of this folder, load the library's own CMakeLists.txt.
add_subdirectory(source)
2 changes: 1 addition & 1 deletion packager/third_party/zlib/source
Submodule source updated 151 files

0 comments on commit df04d0e

Please sign in to comment.