From 4f57be188e40699aa81d9d72af295e699a6d4de4 Mon Sep 17 00:00:00 2001 From: Zachary Hall Date: Fri, 17 Nov 2023 13:12:01 -0800 Subject: [PATCH] Fix Windows and allow static linking --- .github/workflows/win.yml | 2 +- meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 2556f9d..097c840 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -19,7 +19,7 @@ jobs: with: msystem: UCRT64 update: true - install: git mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-meson + install: git mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-imagemagick mingw-w64-ucrt-x86_64-meson - name: Set up build directory run: meson setup builddir - name: Build diff --git a/meson.build b/meson.build index 024b1de..9c20575 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,8 @@ project('graphicsconverter', 'cpp', version : '0.1', default_options : ['warning_level=3', - 'cpp_std=c++14']) + 'cpp_std=c++14', + 'default_library=static']) deps = [ dependency('Magick++', version : '>=6.9.11')