From b6d98909b5aae6fee7e0b1097f9a1b18f370409d Mon Sep 17 00:00:00 2001 From: Stephane Letz Date: Wed, 29 Nov 2023 10:12:49 +0100 Subject: [PATCH] Use -s DYNAMIC_EXECUTION=0 in EMCC compilation so that libfaust-wasm.js can be used only with wasm-unsafe-eval flag. --- build/emcc/CMakeLists.txt | 2 +- build/wasmglue/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/emcc/CMakeLists.txt b/build/emcc/CMakeLists.txt index 01b5bf1b1f1..9f4ab75bc47 100644 --- a/build/emcc/CMakeLists.txt +++ b/build/emcc/CMakeLists.txt @@ -27,7 +27,7 @@ set (SRC ${SRC} ${BINDINGS}) set (WASM_EXPORTED "\"['UTF8ToString', 'stringToUTF8', 'FS']\"") file (GLOB LIBSNDFILE ${WASMGLUE}/*.a) -set (WASM_LINK_FLAGS "--no-heap-copy --bind -O3 --memory-init-file 0 -s LINKABLE=0 -s WASM=1 -s EXPORT_NAME=\"'FaustModule'\" -s MODULARIZE=1 --preload-file ../../wasm-filesystem@usr -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s STACK_SIZE=5MB -s DISABLE_EXCEPTION_CATCHING=1 -s EXPORTED_RUNTIME_METHODS=${WASM_EXPORTED} ${LIBSNDFILE}") +set (WASM_LINK_FLAGS "--no-heap-copy --bind -O3 --memory-init-file 0 -s LINKABLE=0 -s DYNAMIC_EXECUTION=0 -s WASM=1 -s EXPORT_NAME=\"'FaustModule'\" -s MODULARIZE=1 --preload-file ../../wasm-filesystem@usr -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 -s STACK_SIZE=5MB -s DISABLE_EXCEPTION_CATCHING=1 -s EXPORTED_RUNTIME_METHODS=${WASM_EXPORTED} ${LIBSNDFILE}") #################################### # Add the different targets diff --git a/build/wasmglue/CMakeLists.txt b/build/wasmglue/CMakeLists.txt index 00008bc12e6..526cd104b0e 100644 --- a/build/wasmglue/CMakeLists.txt +++ b/build/wasmglue/CMakeLists.txt @@ -53,7 +53,7 @@ set (FAUST_INC ${SRCDIR} # emscripten support set (WASM_EXPORTED "\"['FS']\"") set (LIBSNDFILE "${ROOT}/build/wasmglue/libsndfile.a ${ROOT}/build/wasmglue/libogg.a ${ROOT}/build/wasmglue/libvorbis.a ${ROOT}/build/wasmglue/libvorbisenc.a ${ROOT}/build/wasmglue/libFLAC.a") -set (WASM_LINK_FLAGS "--bind --memory-init-file 0 -s LINKABLE=0 -s WASM=1 -s EXPORT_NAME=\"'FaustModule'\" -s MODULARIZE=1 -s ASSERTIONS=0 -s ALLOW_MEMORY_GROWTH=1 -s STACK_SIZE=5MB -s DISABLE_EXCEPTION_CATCHING=1 -s EXPORTED_RUNTIME_METHODS=${WASM_EXPORTED} ${LIBSNDFILE} ${WASM_LINK_FLAGS_EXTRA}") +set (WASM_LINK_FLAGS "--bind --memory-init-file 0 -s LINKABLE=0 -s DYNAMIC_EXECUTION=0 -s WASM=1 -s EXPORT_NAME=\"'FaustModule'\" -s MODULARIZE=1 -s ASSERTIONS=0 -s ALLOW_MEMORY_GROWTH=1 -s STACK_SIZE=5MB -s DISABLE_EXCEPTION_CATCHING=1 -s EXPORTED_RUNTIME_METHODS=${WASM_EXPORTED} ${LIBSNDFILE} ${WASM_LINK_FLAGS_EXTRA}") #################################### # Add the different targets