aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--cru-words.txt4
-rw-r--r--scripts/meson-emscripten.ini.in7
3 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52cc7a5f..cca0b97e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CRU_DEFAULT_BUILD_SHARED_LIBS ON)
if (EMSCRIPTEN)
- # Webassembly has no idea about static/dynamic libraries.
+ # WebAssembly has no idea about static/dynamic libraries.
set(CRU_DEFAULT_BUILD_SHARED_LIBS OFF)
endif()
diff --git a/cru-words.txt b/cru-words.txt
index 61ec74fb..b9d3b677 100644
--- a/cru-words.txt
+++ b/cru-words.txt
@@ -1 +1,5 @@
emscripten
+
+# cmake
+endfunction
+
diff --git a/scripts/meson-emscripten.ini.in b/scripts/meson-emscripten.ini.in
index 79905f21..0acea3ae 100644
--- a/scripts/meson-emscripten.ini.in
+++ b/scripts/meson-emscripten.ini.in
@@ -1,6 +1,7 @@
[constants]
project_dir = '${PROJECT_SOURCE_DIR}'
emscripten = '${EMSCRIPTEN_TOOLCHAIN}'
+# spellchecker: disable-next-line
emscripten_flags = ['-W', '-Wno-unused-parameter', '-matomics', '-mbulk-memory']
[host_machine]
@@ -12,6 +13,7 @@ endian = 'little'
[binaries]
exe_wrapper = project_dir / 'scripts/emscripten-run.sh'
+# spellchecker: disable
c = emscripten / 'emcc'
cpp = emscripten / 'em++'
ld = emscripten / 'emcc'
@@ -19,8 +21,9 @@ c_ld = emscripten / 'emcc'
cpp_ld = emscripten / 'emcc'
ar = emscripten / 'emar'
nm = emscripten / 'emnm'
-ranlid = emscripten / 'emranlib'
+ranlib = emscripten / 'emranlib'
strip = emscripten / 'emstrip'
+# spellchecker: enable
[built-in options]
default_library = 'static'
@@ -31,6 +34,7 @@ cpp_args = emscripten_flags
xattr = false
tests = false
+# spellchecker: disable
[pixman:project options]
loongson-mmi = 'disabled'
mmx = 'disabled'
@@ -42,4 +46,5 @@ neon = 'disabled'
a64-neon = 'disabled'
iwmmxt = 'disabled'
mips-dspr2 = 'disabled'
+# spellchecker: enable