mirror of
https://git.code.sf.net/p/zint/code
synced 2025-12-17 18:07:02 +00:00
CI: Windows: try using libpng
This commit is contained in:
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
@@ -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 -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 --build build --config Release
|
||||||
cmake -E rename build/Release/zs.lib zlib.lib
|
cmake -E rename build/Release/zs.lib zlib.lib
|
||||||
|
cmake -E rename build/zconf.h zconf.h
|
||||||
|
|
||||||
- name: Install libpng
|
- name: Install libpng
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -125,11 +126,13 @@ jobs:
|
|||||||
git clone --depth=1 https://git.code.sf.net/p/libpng/code lpng && cd lpng
|
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 -B build -DCMAKE_BUILD_TYPE=Release -DPNG_SHARED=OFF -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DZLIB_ROOT="../zlib"
|
||||||
cmake --build build --config Release
|
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
|
- name: Configure CMake
|
||||||
working-directory: build
|
working-directory: build
|
||||||
shell: bash
|
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
|
- name: Build
|
||||||
working-directory: build
|
working-directory: build
|
||||||
|
|||||||
Reference in New Issue
Block a user