Bubel/bubel-ecs
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Don't use ForeachType as it don't work if foreach type is not copyable. #25

Merged
mmcomando merged 2 commits from wasm_fixes into master 2022-10-06 19:01:51 +02:00
Conversation 4 Commits 2 Files changed 2 +12 -1
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ce47bfc65a - Show all commits

13
meson.build
View file

@ -55,15 +55,26 @@ add_project_link_arguments(link_args, language : 'd')
# Dependencies # Dependencies
threads_dep = dependency('threads') 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', ecs_lib = library('BubelECS',
src, src,
d_module_versions : d_versions,
include_directories : [inc], include_directories : [inc],
) )
bubel_ecs_dep = declare_dependency( bubel_ecs_dep = declare_dependency(
include_directories : [inc], include_directories : [inc],
link_with : ecs_lib, link_with : ecs_lib,
dependencies : threads_dep, dependencies : deps,
) )
meson.override_dependency('bubel-ecs', bubel_ecs_dep) meson.override_dependency('bubel-ecs', bubel_ecs_dep)