diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6c496541..8653372e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,6 +118,7 @@ jobs: cmake -B build -DCMAKE_BUILD_TYPE=Release -DZLIB_BUILD_TESTING=OFF -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF -DZLIB_INSTALL_COMPAT_DLL=OFF cmake --build build --config Release cmake -E rename build/Release/zs.lib zlib.lib + cmake -E rename build/zconf.h zconf.h - name: Install libpng shell: bash @@ -125,11 +126,13 @@ jobs: git clone --depth=1 https://git.code.sf.net/p/libpng/code lpng && cd lpng cmake -B build -DCMAKE_BUILD_TYPE=Release -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DZLIB_ROOT="../zlib" cmake --build build --config Release + cmake -E rename build/Release/libpng16_static.lib libpng.lib + cmake -E rename build/pnglibconf.h pnglibconf.h - name: Configure CMake working-directory: build shell: bash - run: cmake $GITHUB_WORKSPACE -A Win32 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_USE_PNG=OFF -DZINT_USE_QT=OFF + run: cmake $GITHUB_WORKSPACE -A Win32 -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DZINT_TEST=ON -DZINT_STATIC=ON -DZINT_USE_QT=OFF -DZLIB_ROOT="../zlib" -DPNG_ROOT="../lpng" - name: Build working-directory: build