Updated.

bin/env_windows.txt

@@ -99,35 +99,25 @@ MX2_MSVC_LIB_X64=${MX2_MSVC_LIB_X64}${MX2_WINDOWS_KITS_DIR}\Lib\${MX2_WINDOWS_KI
 
 '***** EMSCRIPTEN TARGET *****
 
-'Note: you must setup emscripten yourself, sorry!
-
-'Yet another failed attempt to make emscripten easy to use...
-'EMSDK=${MX2_HOME}\devtools\emsdk-portable-64bit
-'EM_CONFIG=${EMSDK}\.emscripten
-'BINARYEN_ROOT=${EMSDK}\clang\nightly-e1.37.9-2017_04_19_23_39\binaryen
-'JAVA_HOME=${EMSDK}\java\7.45_64bit
-'EMSCRIPTEN=${EMSDK}\emscripten\nightly-1.37.9-2017_04_19_23_39
-'PATH=${EMSDK};${PATH}
-'PATH=${EMSDK}\clang\nightly-e1.37.9-2017_04_19_23_39;${PATH}
-'PATH=${EMSDK}\node\4.1.1_64bit\bin;${PATH}
-'PATH=${EMSDK}\python\2.7.5.3_64bit;${PATH}
-'PATH=${EMSDK}\java\7.45_64bit\bin;${PATH}
-'PATH=${EMSDK}\emscripten\nightly-1.37.9-2017_04_19_23_39;${PATH}
+'env vars for incoming 64bit - I've set these via computer->properties so I can use em from cmd line.
+'EMSDK=D:/devtools/emsdk-portable-64bit
+'EMSCRIPTEN=${EMSDK}\emscripten\incoming
+'PATH=${EMSDK}\clang\fastcomp\build_incoming_vs2015_64\RelWithDebInfo\bin;${PATH}
+'PATH=${EMSDK}\emscripten\incoming;${PATH}
 
 'Add mserver_winnt emscripten mini-server/launcher.
 '
 MX2_MSERVER="${MX2_HOME}\devtools\mserver-v86c\mserver_winnt.exe"
 
 'Linker options
-MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1 -s EXTRA_EXPORTED_RUNTIME_METHODS="['Pointer_stringify']"
+MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1
+MX2_LD_OPTS_EMSCRIPTEN_WASM=-s BINARYEN=1
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O2 -s ASSERTIONS=2
 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
+'extra LD opts for 1.37.26 - if you're using 1.37.26 or earlier, you may need to enable these lines.
+'MX2_LD_OPTS_EMSCRIPTEN=${MX2_LD_OPTS_EMSCRIPTEN} -s EXTRA_EXPORTED_RUNTIME_METHODS="['Pointer_stringify']"
+'MX2_LD_OPTS_EMSCRIPTEN_WASM=${MX2_LD_OPTS_EMSCRIPTEN_WASM} -s BINARYEN_TRAP_MODE='allow'
 
 'C Compiler options
 MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1