diff --git a/.gitignore b/.gitignore
index e0e6fff..403ce3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 !skeleton.html
 !**/meson.build
 !**/*.wrap
+!**/*.ini
 !meson_options.txt
 !compile_wasm.py
 !compile_android.py
diff --git a/demos/external/sources/mmutils/thread_pool.d b/demos/external/sources/mmutils/thread_pool.d
index 9156674..7139a97 100644
--- a/demos/external/sources/mmutils/thread_pool.d
+++ b/demos/external/sources/mmutils/thread_pool.d
@@ -1,4 +1,4 @@
-module mmutils.thread_pool;
+module mmutils.thread_pool;
 
 import std.algorithm : map;
 
@@ -10,8 +10,7 @@ version (WebAssembly)
 	version = MM_NO_LOGS;
 	version = MM_USE_POSIX_THREADS;
 	extern(C) struct FILE
-	{
-		
+	{		
 	}
 }
 else 
@@ -1828,4 +1827,4 @@ else
 // -fsanitize=address
 // rdmd -g -of=thread_pool src/mmutils/thread_pool.d && ./thread_pool
 // ldmd2 -release -inline -checkaction=C -g -of=thread_pool src/mmutils/thread_pool.d && ./thread_pool
-// ldmd2 -checkaction=C -g -of=thread_pool src/mmutils/thread_pool.d && ./thread_pool
\ No newline at end of file
+// ldmd2 -checkaction=C -g -of=thread_pool src/mmutils/thread_pool.d && ./thread_pool
diff --git a/demos/meson.build b/demos/meson.build
index 20df64c..8fb051b 100644
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -8,28 +8,73 @@ demos_inc = include_directories('source/')
 external_inc = include_directories('external/sources/')
 
 # Argumesnts
+not_wasm = host_machine.cpu_family() != 'wasm32'
 versions = ['BindSDL_Image','SDL_208', 'BindBC_Static', 'BindSDL_Static']
 
 # Dependencies
 bindbc_loader_dep = dependency('bindbc-loader')
 bindbc_sdl_dep = dependency('bindbc-sdl')
 cimgui_dep = dependency('cimgui')
-sdl2_dep = dependency('SDL2')
-sdl2_image_dep = dependency('SDL2_image')
+sdl2_dep = dependency('SDL2', required: not_wasm) # On wasm delivered by Emscripten
+sdl2_image_dep = dependency('SDL2_image', required: not_wasm)
 
 subdir('utils') # Utils library
 
-executable('decs-demos', [demos_src, external_src], 
-	include_directories : [demos_inc, external_inc],
-	d_module_versions : versions,
-	link_with : [ecs_lib, ecs_utils_lib],
-	dependencies : [
-		bindbc_loader_dep,
-		bindbc_sdl_dep,
-		cimgui_dep,
-		decs_dep,
-		ecs_utils_dep,
-		sdl2_dep,
-		sdl2_image_dep,
-	],
-)
\ No newline at end of file
+deps = [
+	bindbc_loader_dep,
+	bindbc_sdl_dep,
+	cimgui_dep,
+	decs_dep,
+	ecs_utils_dep,
+	sdl2_dep,
+	sdl2_image_dep,
+]
+
+if not_wasm
+	exe = executable('decs-demos', [demos_src, external_src],
+		include_directories : [demos_inc, external_inc],
+		d_module_versions : versions,
+		link_with : [ecs_lib, ecs_utils_lib],
+		dependencies : deps,
+	)
+
+	test('basic-tests', exe)
+else
+	versions += ['MM_USE_POSIX_THREADS', 'ECSEmscripten']
+
+	decs_demos_lib = library('decs-demos', [demos_src, external_src],
+		include_directories : [demos_inc, external_inc],
+		d_module_versions : versions,
+		dependencies : deps,
+	)
+	cimgui_lib = subproject('cimgui').get_variable('lib')
+	sdl2_lib = subproject('bindbc-sdl').get_variable('lib')
+	file_packager = find_program('file_packager')
+
+	# Pack assets
+	assets_path = meson.source_root() / 'demos/assets@assets'
+	packed_assets = custom_target('packed-assets-web',
+		command: [file_packager, 'demos/assets.data', '--preload', assets_path, '--js-output=@OUTPUT@'],
+		output: ['assets.js'],
+		build_by_default: true,
+	)
+
+	# build single-threaded demos with HTML output
+	wasm_web = custom_target('decs-demos-wasm-web',
+		command: [emcc, args_wasm, '--pre-js', packed_assets, '-o', '@OUTPUT@', '@INPUT@'],
+		input: [sdl2_lib, ecs_lib, decs_demos_lib, ecs_utils_lib, cimgui_lib],
+		output: ['ecs_demo.html'],
+		build_by_default: true,
+	)
+	
+	# build multi-threded demos with JS output. Custom shellfile detects if web browser threads are enabled and select proper JS and WASM.
+	wasm_web_mt = custom_target('decs-demos-wasm-web-mt',
+		command: [emcc, args_wasm, '-s', 'USE_PTHREADS=1', '--pre-js', packed_assets, '-o', '@OUTPUT@', '@INPUT@'],
+		input: [sdl2_lib, ecs_lib, decs_demos_lib, ecs_utils_lib, cimgui_lib],
+		output: ['ecs_demo_mt.js'],
+		build_by_default: true,
+	)
+
+	summary('decs-demoswasm-index', wasm_web.full_path())
+endif
+
diff --git a/meson.build b/meson.build
index b3770bf..ce5afb3 100644
--- a/meson.build
+++ b/meson.build
@@ -52,12 +52,22 @@ endif
 add_project_arguments(args, language : 'd')
 add_project_link_arguments(link_args, language : 'd')
 
+versions = []
+
+if host_machine.cpu_family() == 'wasm32'
+	add_global_arguments('--output-bc', language : 'd') # Adding it in cross files breaks linker detection
+	emcc = find_program('emcc')
+	args_wasm = ['-O3', '-s', 'FORCE_FILESYSTEM=1', '-s', 'USE_SDL=2', '-s', 'USE_SDL_IMAGE=2', '-s', 'SDL2_IMAGE_FORMATS=["png"]', '-s', 'ERROR_ON_UNDEFINED_SYMBOLS=0', '-s', 'ALLOW_MEMORY_GROWTH=1', '-s', 'WASM_MEM_MAX=1024MB', '-s', 'MALLOC=dlmalloc', '-s', 'WASM=1', '--shell-file', '../demos/emscripten_multi_shell.html', '-s', 'DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1']
+	versions = ['ECSEmscripten']
+endif
+
+
 # Dependencies
 threads_dep = dependency('threads')
 
-ecs_lib = library('decs',
-	src,
+ecs_lib = library('decs', src,
 	include_directories : [inc],
+	d_module_versions : versions
 )
 
 decs_dep = declare_dependency(
diff --git a/meson_crosscompile_base.ini b/meson_crosscompile_base.ini
new file mode 100644
index 0000000..698876f
--- /dev/null
+++ b/meson_crosscompile_base.ini
@@ -0,0 +1,3 @@
+[constants]
+emscripten_path = '<change-path>/emsdk/upstream/emscripten'
+ldc_path = '<change-path>/ldc-1.25.0/bin'
\ No newline at end of file
diff --git a/meson_crosscompile_wasm.ini b/meson_crosscompile_wasm.ini
new file mode 100644
index 0000000..9571392
--- /dev/null
+++ b/meson_crosscompile_wasm.ini
@@ -0,0 +1,28 @@
+; Ex. build:
+; meson setup b_wasm -DbetterC=true -DBuildDemos=true --cross-file=meson_crosscompile_base.ini --cross-file=meson_crosscompile_wasm.ini
+; ninja -C b_wasm
+; emrun --browser chromium-browser  ./b_wasm/demos/game.h
+
+[binaries]
+emcc = emscripten_path / 'emcc'
+file_packager = [ 'python3', emscripten_path / 'tools/file_packager.py']
+c = emscripten_path / 'emcc'
+cpp = emscripten_path / 'em++'
+ar = emscripten_path / 'emar'
+d = ldc_path / 'ldc2'
+; exe_wrapper = emscripten_path / 'emrun'
+
+[properties]
+needs_exe_wrapper = true
+
+[built-in options]
+d_args = ['-mtriple=wasm32-unknown-unknown-wasm', '--d-version=ECSEmscripten']
+c_args =   ['-s', 'FORCE_FILESYSTEM=1','-s', 'USE_PTHREADS=1', '-s', 'USE_SDL=2', '-s', 'ALLOW_MEMORY_GROWTH=1', '-s', 'WASM_MEM_MAX=1024MB', '-s', 'MALLOC=dlmalloc', '-s', 'WASM=1']
+cpp_args = ['-s', 'FORCE_FILESYSTEM=1','-s', 'USE_PTHREADS=1', '-s', 'USE_SDL=2', '-s', 'ALLOW_MEMORY_GROWTH=1', '-s', 'WASM_MEM_MAX=1024MB', '-s', 'MALLOC=dlmalloc', '-s', 'WASM=1']
+default_library = 'static'
+
+[host_machine]
+system = 'Emscripten'
+cpu_family = 'wasm32'
+cpu = 'wasm32'
+endian = 'little'
\ No newline at end of file
diff --git a/subprojects/bindbc-loader.wrap b/subprojects/bindbc-loader.wrap
index b99f744..88d2488 100644
--- a/subprojects/bindbc-loader.wrap
+++ b/subprojects/bindbc-loader.wrap
@@ -1,6 +1,7 @@
 [wrap-git]
-url = https://github.com/BindBC/bindbc-loader.git
-revision = 9a51af991acce3c67e51695c07bf3fa6419ef938
+url = https://github.com/mmcomando/bindbc-loader.git
+push-url = https://github.com/BindBC/bindbc-loader.git
+revision = wasm
 patch_directory = bindbc-loader
 
 [provide]
diff --git a/subprojects/bindbc-sdl.wrap b/subprojects/bindbc-sdl.wrap
index 3b159a0..170cc8f 100644
--- a/subprojects/bindbc-sdl.wrap
+++ b/subprojects/bindbc-sdl.wrap
@@ -1,6 +1,7 @@
 [wrap-git]
-url = https://github.com/BindBC/bindbc-sdl.git
-revision = 5c936064b7226630f5080f4b12b77ee39c8ac64b
+url = https://github.com/mmcomando/bindbc-sdl.git
+push-url = https://github.com/BindBC/bindbc-sdl.git
+revision = wasm
 patch_directory = bindbc-sdl
 
 [provide]
diff --git a/subprojects/packagefiles/bindbc-loader/meson.build b/subprojects/packagefiles/bindbc-loader/meson.build
index ce3bdf0..1d0aaab 100644
--- a/subprojects/packagefiles/bindbc-loader/meson.build
+++ b/subprojects/packagefiles/bindbc-loader/meson.build
@@ -3,12 +3,17 @@ project('bindbc-loader', 'd', version : '0.3.2', default_options: ['default_libr
 # Files
 src = files(
 	'source/bindbc/loader/package.d',
-	'source/bindbc/loader/sharedlib.d',
+	# 'source/bindbc/loader/sharedlib.d', # Not implemented for wasm
 	'source/bindbc/loader/system.d',
 )
 
 inc = include_directories('source')
 
+if host_machine.cpu_family() != 'wasm32'
+	src = files(
+		'source/bindbc/loader/sharedlib.d',
+	)
+endif
 # Dependencies
 lib = library('bindbc-loader', src,
 	include_directories : [inc],
diff --git a/subprojects/packagefiles/cimgui/meson.build b/subprojects/packagefiles/cimgui/meson.build
index e4c1a41..d161540 100644
--- a/subprojects/packagefiles/cimgui/meson.build
+++ b/subprojects/packagefiles/cimgui/meson.build
@@ -1,24 +1,33 @@
-project('cimgui', 'cpp', version : '1.73.0', default_options: ['default_library=shared', 'warning_level=1'])
+project('cimgui', 'cpp', version : '1.73.0', default_options: ['default_library=static', 'warning_level=1'])
 
 # Files
-src = [
+src = files(
 	'cimgui.cpp',
 	'imgui/imgui.cpp',
 	'imgui/imgui_draw.cpp',
 	'imgui/imgui_demo.cpp',
 	'imgui/imgui_widgets.cpp',
-]
+)
 
 inc = [ '.' ]
+inc +='imgui/examples/'
 pub_inc = [ 'imgui' ]
 
-# Dependencies
-# bindbc_loader_dep = dependency('bindbc-loader')
+if host_machine.cpu_family() == 'wasm32'
+	# For wasm we use C++ events/image handling implementation
+	src += files(
+		'imgui/examples/imgui_impl_opengl3.cpp',
+		'imgui/examples/imgui_impl_sdl.cpp',
+	)
+endif
 
-lib = shared_library('cimgui', src,
-	# dependencies : bindbc_loader_dep,
+
+add_project_arguments('-DIMGUI_IMPL_API=extern "C" ', language : 'cpp')
+
+# Dependencies
+lib = library('cimgui', src,
 	include_directories : [inc, pub_inc],
-	# pic : true,
+	pic : true,
 )
 
 cimgui_dep = declare_dependency(
diff --git a/tests/meson.build b/tests/meson.build
index cfccaa7..dbf051d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -10,12 +10,23 @@ tests_src = files(
 	'vector.d'
 )
 
-exe = executable('decs-tests',
-	tests_src,
-	include_directories : [inc, include_directories('..')],
-	d_args : args,
-	link_args : link_args,
-	dependencies : decs_dep,
-)
+if host_machine.cpu_family() != 'wasm32'
+	exe = executable('decs-tests', tests_src,
+		include_directories : [inc, '..'],
+		dependencies : decs_dep,
+	)
 
-test('basic-tests', exe)
+	test('basic-tests', exe)
+else
+	tests_lib = library('decs-tests', tests_src,
+		include_directories : [inc],
+		d_module_versions : ['ECSEmscripten'],
+	)
+	wasm_web = custom_target('wasm-web',
+		command: [emcc, args_wasm, '-o', '@OUTPUT@', '@INPUT@'],
+		input: [ecs_lib, tests_lib],
+		output: ['index.html'],
+		build_by_default: true,
+	)
+	summary('wasm-index', wasm_web.full_path())
+endif