From 10e466ca0e4a6ea986f5f0fadaaf0dd24a713927 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Thu, 7 Oct 2021 12:55:13 +0900 Subject: [PATCH] infra : add window build (with loaders) --- .github/workflows/build_win.yml | 25 +++++++++++++++++++++---- src/loaders/external_png/meson.build | 6 +++++- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_win.yml b/.github/workflows/build_win.yml index 9584a00..a4f59c4 100644 --- a/.github/workflows/build_win.yml +++ b/.github/workflows/build_win.yml @@ -11,16 +11,13 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 - with: - submodules: true - name: Install Packages run: | pip install meson==0.58.0 ninja - name: Build run: | - meson --backend=ninja build --buildtype=release + meson --backend=ninja build where link - ninja -C build ninja -C build install - uses: actions/upload-artifact@v2 @@ -28,3 +25,23 @@ jobs: name: result path: build/src\thorvg* + build_with_loaders: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 + - name: Install Packages + run: | + pip install meson==0.58.0 ninja + + - name: Install Packages(png, jpg) + run: | + vcpkg install libpng + vcpkg install libjpeg-turbo + + - name: Build + run: | + meson --backend=ninja build -Dloaders="svg, tvg, png, jpg" -Dsavers="tvg" -Dbindings="capi" + where link + ninja -C build install + diff --git a/src/loaders/external_png/meson.build b/src/loaders/external_png/meson.build index 61a386f..ef28b4a 100644 --- a/src/loaders/external_png/meson.build +++ b/src/loaders/external_png/meson.build @@ -3,7 +3,11 @@ source_file = [ 'tvgPngLoader.cpp', ] -png_dep = meson.get_compiler('cpp').find_library('libpng') +png_dep = dependency('libpng', required: false) + +if not png_dep.found() + png_dep = meson.get_compiler('cpp').find_library('libpng') +endif if png_dep.found() subloader_dep += [declare_dependency( -- 2.7.4