2
0
marksibly 7 жил өмнө
parent
commit
8577f7ea8b
1 өөрчлөгдсөн 6 нэмэгдсэн , 7 устгасан
  1. 6 7
      bin/env_linux.txt

+ 6 - 7
bin/env_linux.txt

@@ -21,21 +21,20 @@ MX2_CPP_OPTS_LINUX_RELEASE=-O3 -DNDEBUG
 
 'For emscripten builds, you need emcc, em++ and emar in your PATH.
 
+EMSDK=${HOME}/emsdk-portable
+
+PATH=${EMSDK}:${EMSDK}/clang/fastcomp/build_incoming_64/bin:${EMSDK}/node/4.1.1_64bit/bin:${EMSDK}/emscripten/incoming:${PATH}
+
 'To run emscripten apps you'll need mserver mini-server.
 '
 MX2_MSERVER="${MX2_HOME}/devtools/mserver-v86c/mserver_linux"
 
 '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_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
-
 '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
 MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-O2