From ce47bfc65aaf410f3088416395b1f19aaddcf3c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Masiukiewicz?= Date: Wed, 5 Oct 2022 18:39:07 +0200 Subject: [PATCH] Fix wasm compilation --- meson.build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 8275cc9..3f261f8 100644 --- a/meson.build +++ b/meson.build @@ -55,15 +55,26 @@ add_project_link_arguments(link_args, language : 'd') # Dependencies threads_dep = dependency('threads') +d_versions = [] +deps = [] +if host_machine.cpu_family() == 'wasm32' + d_versions += 'ECSEmscripten' +else + # meson incorectly adds "-s USE_PTHREADS=1" to ldc2 invocation whe pthreads is added as dependency + # add it for non wasm builds + deps += threads_dep +endif + ecs_lib = library('BubelECS', src, + d_module_versions : d_versions, include_directories : [inc], ) bubel_ecs_dep = declare_dependency( include_directories : [inc], link_with : ecs_lib, - dependencies : threads_dep, + dependencies : deps, ) meson.override_dependency('bubel-ecs', bubel_ecs_dep)