Skip to content

Commit

Permalink
Upgrade zlib to current master status
Browse files Browse the repository at this point in the history
  • Loading branch information
fjtrujy committed Feb 23, 2025
1 parent f30263b commit 6dea567
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions build-cmakelibs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ function build_irx {
##
## Clone repos
##
$FETCH v1.3.1 https://github.com/madler/zlib &
# Try to solve windows linking issues
$FETCH 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 https://github.com/madler/zlib &
$FETCH v5.4.0 https://github.com/xz-mirror/xz.git &
$FETCH v1.9.4 https://github.com/lz4/lz4.git &
$FETCH v1.9.2 https://github.com/nih-at/libzip.git &
Expand Down Expand Up @@ -133,12 +134,6 @@ wait
# extract argtable2
tar -xzf build/argtable2-13.tar.gz -C build

# NOTE: zlib
# Make sure only one target will generate libz
pushd build/zlib
sed -i -e 's/set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)/set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z)/' CMakeLists.txt
popd

# NOTE: jsoncpp
# "snprintf" not found in "std" namespace error may occur, so patch that out here.
pushd build/jsoncpp
Expand All @@ -163,7 +158,7 @@ cd build
##
## Build cmake projects
##
build_ee zlib -DUNIX:BOOL=ON -DZLIB_BUILD_EXAMPLES=OFF -DINSTALL_PKGCONFIG_DIR="${PS2SDK}/ports/lib/pkgconfig"
build_ee zlib -DUNIX:BOOL=ON -DZLIB_BUILD_EXAMPLES=OFF -DZLIB_BUILD_SHARED=OFF -DINSTALL_PKGCONFIG_DIR="${PS2SDK}/ports/lib/pkgconfig"
build_ee xz -DTUKLIB_CPUCORES_FOUND=ON -DTUKLIB_PHYSMEM_FOUND=ON -DHAVE_GETOPT_LONG=OFF -DBUILD_TESTING=OFF
build_ee lz4/build/cmake -DLZ4_POSITION_INDEPENDENT_LIB=OFF -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF
build_ee libzip -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF
Expand Down

0 comments on commit 6dea567

Please sign in to comment.