From 65b0b49720e20343d633551f68321892e3483878 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 6 Mar 2026 22:01:14 -0500 Subject: [PATCH] Update zlib to 1.3.2 Note that the DLL name created by CMake with `BUILD_SHARED_LIBS` has changed from `zlib1.dll` to `z.dll`. This was caused by the "Continued rewrite of CMake build [Vollstrecker]" from its changelog , and has been reported in . The MinGW package `libz-mingw-w64-dev` still calls it `libz1.dll`. --- .github/scripts/get_win_deps.ps1 | 4 ++-- .github/workflows/create-release-artifacts.yml | 4 ++-- .github/workflows/testing.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/get_win_deps.ps1 b/.github/scripts/get_win_deps.ps1 index 0888cc7d..c457c708 100644 --- a/.github/scripts/get_win_deps.ps1 +++ b/.github/scripts/get_win_deps.ps1 @@ -15,9 +15,9 @@ function getlibrary ([string] $URI, [string] $filename, [string] $hash, [string] Expand-Archive -DestinationPath $destdir $filename } -getlibrary 'https://www.zlib.net/zlib131.zip' 'zlib.zip' '72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17' . +getlibrary 'https://www.zlib.net/zlib132.zip' 'zlib.zip' 'e8bf55f3017aa181690990cb58a994e77885da140609fc8f94abe9b65d2cae28' . getlibrary 'https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.53.zip' 'libpng.zip' '9fb99118ec4523d9a9dab652ce7c2472ec76f6ccd69d1aba3ab873bb8cf84b98' . getlibrary 'https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip' 'winflexbison.zip' '8d324b62be33604b2c45ad1dd34ab93d722534448f55a16ca7292de32b6ac135' install_dir -Move-Item zlib-1.3.1 zlib +Move-Item zlib-1.3.2 zlib Move-Item libpng-1.6.53 libpng diff --git a/.github/workflows/create-release-artifacts.yml b/.github/workflows/create-release-artifacts.yml index df91e360..159179c3 100644 --- a/.github/workflows/create-release-artifacts.yml +++ b/.github/workflows/create-release-artifacts.yml @@ -38,7 +38,7 @@ jobs: key: ${{ matrix.arch }}-${{ hashFiles('zlib/**', 'libpng/**') }} - name: Build zlib if: steps.cache.outputs.cache-hit != 'true' - run: | # BUILD_SHARED_LIBS causes the output DLL to be correctly called `zlib1.dll` + run: | # BUILD_SHARED_LIBS causes the output DLL to be called `z.dll` as of zlib 1.3.2 (formerly `zlib1.dll`) cmake -S zlib -B zbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DBUILD_SHARED_LIBS=ON cmake --build zbuild --config Release -j - name: Install zlib @@ -61,7 +61,7 @@ jobs: cmake --install build --verbose --prefix install_dir --strip - name: Package binaries run: | - Compress-Archive -LiteralPath @("install_dir/bin/rgbasm.exe", "install_dir/bin/rgblink.exe", "install_dir/bin/rgbfix.exe", "install_dir/bin/rgbgfx.exe", "install_dir/bin/zlib1.dll", "install_dir/bin/libpng16.dll") "rgbds-win${{ matrix.bits }}.zip" + Compress-Archive -LiteralPath @("install_dir/bin/rgbasm.exe", "install_dir/bin/rgblink.exe", "install_dir/bin/rgbfix.exe", "install_dir/bin/rgbgfx.exe", "install_dir/bin/z.dll", "install_dir/bin/libpng16.dll") "rgbds-win${{ matrix.bits }}.zip" - name: Upload Windows binaries uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 22d59938..adfb1829 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -153,7 +153,7 @@ jobs: - name: Build zlib if: steps.cache.outputs.cache-hit != 'true' shell: bash - run: | # BUILD_SHARED_LIBS causes the output DLL to be correctly called `zlib1.dll` + run: | # BUILD_SHARED_LIBS causes the output DLL to be called `z.dll` as of zlib 1.3.2 (formerly `zlib1.dll`) cmake -S zlib -B zbuild -A ${{ matrix.platform }} -Wno-dev -DCMAKE_INSTALL_PREFIX=install_dir -DBUILD_SHARED_LIBS=ON cmake --build zbuild --config Release -j - name: Install zlib @@ -178,7 +178,7 @@ jobs: shell: bash run: | mkdir bins - cp install_dir/bin/{rgbasm.exe,rgblink.exe,rgbfix.exe,rgbgfx.exe,zlib1.dll,libpng16.dll} bins + cp install_dir/bin/{rgbasm.exe,rgblink.exe,rgbfix.exe,rgbgfx.exe,z.dll,libpng16.dll} bins - name: Upload Windows binaries uses: actions/upload-artifact@v4 with: