Merge branch 'master' into wasm_demos

# Conflicts:
#	demos/external/sources/mmutils/thread_pool.d
#	tests/meson.build
This commit is contained in:
mmcomando 2021-03-13 13:30:58 +01:00
commit 84a5cbef13
32 changed files with 1568 additions and 1535 deletions

View file

@ -3,10 +3,12 @@ project('decs', 'd', version : '0.5.0')
# Options
betterC_opt = get_option('betterC')
BuildDemos_opt = get_option('BuildDemos')
BuildTests_opt = get_option('BuildTests')
LTO_otp = get_option('LTO')
summary('betterC enabled', betterC_opt)
summary('build demos', BuildDemos_opt)
summary('build tests', BuildTests_opt)
summary('LTO enabled', LTO_otp)
meson_minimum_version = '>=0.57.1'
@ -71,7 +73,9 @@ decs_dep = declare_dependency(
)
# Tests
subdir('tests')
if BuildTests_opt
subdir('tests')
endif
# Demos
if BuildDemos_opt