From 3a0193edfac2ba577fec5bb12f0af2f49643ce74 Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Sun, 23 Feb 2025 20:44:42 +0100 Subject: [PATCH] Upgrade zlib to current master status --- build-cmakelibs.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build-cmakelibs.sh b/build-cmakelibs.sh index c7efbc52..c89d8b97 100755 --- a/build-cmakelibs.sh +++ b/build-cmakelibs.sh @@ -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 & @@ -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