Skip to content

Commit 6dea567

Browse files
committed
Upgrade zlib to current master status
1 parent f30263b commit 6dea567

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

build-cmakelibs.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ function build_irx {
6767
##
6868
## Clone repos
6969
##
70-
$FETCH v1.3.1 https://github.com/madler/zlib &
70+
# Try to solve windows linking issues
71+
$FETCH 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 https://github.com/madler/zlib &
7172
$FETCH v5.4.0 https://github.com/xz-mirror/xz.git &
7273
$FETCH v1.9.4 https://github.com/lz4/lz4.git &
7374
$FETCH v1.9.2 https://github.com/nih-at/libzip.git &
@@ -133,12 +134,6 @@ wait
133134
# extract argtable2
134135
tar -xzf build/argtable2-13.tar.gz -C build
135136

136-
# NOTE: zlib
137-
# Make sure only one target will generate libz
138-
pushd build/zlib
139-
sed -i -e 's/set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)/set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME z)/' CMakeLists.txt
140-
popd
141-
142137
# NOTE: jsoncpp
143138
# "snprintf" not found in "std" namespace error may occur, so patch that out here.
144139
pushd build/jsoncpp
@@ -163,7 +158,7 @@ cd build
163158
##
164159
## Build cmake projects
165160
##
166-
build_ee zlib -DUNIX:BOOL=ON -DZLIB_BUILD_EXAMPLES=OFF -DINSTALL_PKGCONFIG_DIR="${PS2SDK}/ports/lib/pkgconfig"
161+
build_ee zlib -DUNIX:BOOL=ON -DZLIB_BUILD_EXAMPLES=OFF -DZLIB_BUILD_SHARED=OFF -DINSTALL_PKGCONFIG_DIR="${PS2SDK}/ports/lib/pkgconfig"
167162
build_ee xz -DTUKLIB_CPUCORES_FOUND=ON -DTUKLIB_PHYSMEM_FOUND=ON -DHAVE_GETOPT_LONG=OFF -DBUILD_TESTING=OFF
168163
build_ee lz4/build/cmake -DLZ4_POSITION_INDEPENDENT_LIB=OFF -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF
169164
build_ee libzip -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF

0 commit comments

Comments
 (0)