mantarimay
/
Aegisub
forked from mia/Aegisub
1
0
Fork 0
Code Pull Requests Activity

meson: set wx subproject buildtype, remove d_vscrt hack

This commit is contained in:
Ryan Lucia 2020-11-22 16:30:18 -05:00
parent 47f7aa879d
commit 194521e777
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -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'

5
meson.build
View File

@ -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'),