forked from mia/Aegisub
meson: set wx subproject buildtype, remove d_vscrt hack
This commit is contained in:
parent
47f7aa879d
commit
194521e777
|
@ -62,7 +62,7 @@ jobs:
|
||||||
- name: Configure (Windows)
|
- name: Configure (Windows)
|
||||||
if: matrix.config.os == 'windows-latest'
|
if: matrix.config.os == 'windows-latest'
|
||||||
# -Dfreetype2:png=enabled is a workaround for https://savannah.nongnu.org/bugs/?59458
|
# -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)
|
- name: Configure (Linux)
|
||||||
if: matrix.config.os == 'ubuntu-latest'
|
if: matrix.config.os == 'ubuntu-latest'
|
||||||
|
|
|
@ -116,11 +116,16 @@ else
|
||||||
if get_option('default_library') == 'static'
|
if get_option('default_library') == 'static'
|
||||||
build_shared = 'OFF'
|
build_shared = 'OFF'
|
||||||
endif
|
endif
|
||||||
|
build_type = 'Release'
|
||||||
|
if get_option('buildtype') == 'debug'
|
||||||
|
build_type = 'Debug'
|
||||||
|
endif
|
||||||
|
|
||||||
wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
|
wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
|
||||||
'-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
|
'-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
|
||||||
'-DwxBUILD_SHARED=@0@'.format(build_shared),
|
'-DwxBUILD_SHARED=@0@'.format(build_shared),
|
||||||
'-DwxUSE_WEBVIEW=OFF', # breaks build on linux
|
'-DwxUSE_WEBVIEW=OFF', # breaks build on linux
|
||||||
|
'-DCMAKE_BUILD_TYPE=@0@'.format(build_type),
|
||||||
'-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
|
'-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
|
||||||
deps += [
|
deps += [
|
||||||
wx.dependency('wxmono'),
|
wx.dependency('wxmono'),
|
||||||
|
|
Loading…
Reference in New Issue