Updated macos env.

bin/env_macos.txt

@@ -26,12 +26,23 @@ MX2_AS_OPTS=
 
 '***** EMSCRIPTEN TARGET *****
 
-'For emscripten builds, you need emcc, em++ and emar in your PATH.
+'IMPORTANT:
 '
-'Alas, modern macos apps no longer inherit PATH settings so we need to harccode some in.
-'These may need to be changed depending on where you install emscripten.
-EMSCRIPTEN=${HOME}/emsdk/emscripten/1.35.0
-PATH=${HOME}/emsdk:${HOME}/emsdk/clang/e1.35.0_64bit:${HOME}/emsdk/node/0.12.2_64bit/bin:${HOME}/emsdk/emscripten/1.35.0:${PATH}
+'Precompiled emscripten sdk packages appear to be completely broken on macos.
+'
+'So you'll need to compile emscripten from source. Fortunately, this is quite easy to do as it's
+'just like installing a precompiled package, ie:
+'
+'./emsdk install sdk-incoming-64bit
+'./emsdk activate sdk-incoming-64bit
+'
+'then wait...
+'
+'Also, change this to the location of your emsdk:
+'
+EMSDK=${HOME}/emsdk-portable
+
+PATH=${EMSDK}:${EMSDK}/clang/fastcomp/build_incoming_64/bin:${EMSDK}/node/4.1.1_64bit/bin:${EMSDK}/emscripten/incoming:${PATH}
 
 'El Capitan broke my python...
 '
@@ -42,15 +53,11 @@ PATH=/usr/local/bin:${PATH}
 MX2_MSERVER=open "${MX2_HOME}/devtools/mserver-v86c/mserver_macos.app" --args
 
 'LD 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_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
+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