From 194521e777f484767b86882f40b896dc444383c1 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sun, 22 Nov 2020 16:30:18 -0500 Subject: [PATCH] meson: set wx subproject buildtype, remove d_vscrt hack --- .github/workflows/ci.yml | 2 +- meson.build | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 705b545d8..01dbbf193 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: - name: Configure (Windows) if: matrix.config.os == 'windows-latest' # -Dfreetype2:png=enabled is a workaround for https://savannah.nongnu.org/bugs/?59458 - run: meson build -Db_vscrt=mdd -Ddefault_library=static --force-fallback-for=zlib,harfbuzz -Dfreetype2:zlib=system -Dfreetype2:png=enabled -Dfreetype2:default_library=static + run: meson build -Ddefault_library=static --force-fallback-for=zlib,harfbuzz -Dfreetype2:zlib=system -Dfreetype2:png=enabled -Dfreetype2:default_library=static - name: Configure (Linux) if: matrix.config.os == 'ubuntu-latest' diff --git a/meson.build b/meson.build index 4961e4a7b..3c331b620 100644 --- a/meson.build +++ b/meson.build @@ -116,11 +116,16 @@ else if get_option('default_library') == 'static' build_shared = 'OFF' endif + build_type = 'Release' + if get_option('buildtype') == 'debug' + build_type = 'Debug' + endif wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF', '-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson '-DwxBUILD_SHARED=@0@'.format(build_shared), '-DwxUSE_WEBVIEW=OFF', # breaks build on linux + '-DCMAKE_BUILD_TYPE=@0@'.format(build_type), '-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson deps += [ wx.dependency('wxmono'),