WASM LD opts now in env file.

bin/env_linux.txt

@@ -41,6 +41,12 @@ MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=268435456 -s D
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'wasm LD opts for 1.37.22+
+MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'
+
+'wasm LD opts for 1.37.9+
+'MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1
+
 'C compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -I. -s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1 -Wno-warn-absolute-paths ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1 -Wno-undefined-bool-conversion -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-warn-absolute-paths 
 MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O2

bin/env_macos.txt

@@ -44,6 +44,12 @@ MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTI
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
+'wasm LD opts for 1.37.22+
+MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'
+
+'wasm LD opts for 1.37.9+
+'MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1
+
 'C compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1
 MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O2

bin/env_windows.txt

@@ -123,17 +123,22 @@ MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTI
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-s ASSERTIONS=2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=
 
+'wasm LD opts for 1.37.22+
+MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'
+
+'wasm LD opts for 1.37.9+
+'MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1
+
 'C Compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1
-MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O2 -s ASSERTIONS=2
+MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O2
 MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3 -DNDEBUG
 
 'C++ Compiler options
 MX2_CPP_OPTS_EMSCRIPTEN=-std=c++11 -Wno-all -s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1
-MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=-O2 -s ASSERTIONS=2
+MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=-O2
 MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3 -DNDEBUG
 
-
 '***** ANDROID TARGET *****
 
 'Note: Requires Android Studio + Android NDK, see: https://developer.android.com/studio/index.html

src/mx2cc/buildproduct.monkey2

@@ -671,7 +671,13 @@ Class GccBuildProduct Extends BuildProduct
 			
 			cmd+=" --preload-file ~q"+assetsDir+"@/assets~q"
 			
-			If opts.appType.StartsWith( "wasm" ) cmd+=" -s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'"
+'			If opts.appType.StartsWith( "wasm" ) cmd+=" -s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'"
+
+			If opts.appType.StartsWith( "wasm" )
+				Local wopts:=GetEnv( "MX2_LD_OPTS_EMSCRIPTEN_WASM" )
+				If Not wopts wopts="-s BINARYEN=1 -s BINARYEN_TRAP_MODE='allow'"
+				cmd+=" "+wopts
+			Endif
 		End
 		
 		If opts.verbose>=0 Print "Linking "+outputFile+"..."