Decided to just build everything by default and not have separate all or examples targets since we don't really have much control over what's a top-level target anyway (and ninja on its own == ninja all). Also set layout to flat by default, since it keeps everything together, which will lead to less surprising behavior on Windows and is more useful for our release packages.
This commit is contained in:
parent
35750c41fe
commit
ff3d39213e
|
@ -56,9 +56,6 @@ foreach name, args : libui_examples
|
||||||
link_with: libui_libui,
|
link_with: libui_libui,
|
||||||
cpp_args: args.get('cpp_args', []),
|
cpp_args: args.get('cpp_args', []),
|
||||||
link_args: args.get('link_args', []) + libui_example_link_args,
|
link_args: args.get('link_args', []) + libui_example_link_args,
|
||||||
build_by_default: false,
|
|
||||||
gui_app: false,
|
gui_app: false,
|
||||||
install: false)
|
install: false)
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
# MESONTODO define the top-level examples target here
|
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
# [--layout=flat] \ (useful for distribution and Windows DLL tests)
|
# [--layout=flat] \ (useful for distribution and Windows DLL tests)
|
||||||
# [--b_sanitize=whatever]
|
# [--b_sanitize=whatever]
|
||||||
# It turns out that I wouldn't really need any custom options; go figure.
|
# It turns out that I wouldn't really need any custom options; go figure.
|
||||||
# MESONTODO figure out why test and examples aren't included in ninja all
|
|
||||||
|
|
||||||
# TODO I'm not sure how to allow building 32-bit instead of 64-bit with meson
|
# TODO I'm not sure how to allow building 32-bit instead of 64-bit with meson
|
||||||
|
|
||||||
|
@ -17,6 +16,7 @@ project('libui', ['c', 'cpp'],
|
||||||
default_options: [
|
default_options: [
|
||||||
'buildtype=debug', # build debug by default
|
'buildtype=debug', # build debug by default
|
||||||
'default_library=shared', # build shared libraries by default
|
'default_library=shared', # build shared libraries by default
|
||||||
|
'layout=flat', # keep all outputs together by default
|
||||||
|
|
||||||
# these are forced options, but meson doesn't let me set these up separately before I call project() (TODO https://github.com/mesonbuild/meson/issues/5179)
|
# these are forced options, but meson doesn't let me set these up separately before I call project() (TODO https://github.com/mesonbuild/meson/issues/5179)
|
||||||
'warning_level=3', # always max warnings
|
'warning_level=3', # always max warnings
|
||||||
|
|
|
@ -44,6 +44,5 @@ endif
|
||||||
executable('tester', libui_test_sources,
|
executable('tester', libui_test_sources,
|
||||||
dependencies: libui_binary_deps,
|
dependencies: libui_binary_deps,
|
||||||
link_with: libui_libui,
|
link_with: libui_libui,
|
||||||
build_by_default: false,
|
|
||||||
gui_app: false,
|
gui_app: false,
|
||||||
install: false)
|
install: false)
|
||||||
|
|
Loading…
Reference in New Issue