Updated.

bin/env_windows.txt

@@ -77,17 +77,17 @@ 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
-MX2_LD_OPTS_EMSCRIPTEN_DEBUG=
+MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-s ASSERTIONS=2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=
 
 '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=-Os
+MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -Wno-all -s -s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1
+MX2_CC_OPTS_EMSCRIPTEN_DEBUG=-Os -s ASSERTIONS=2
 MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3 -DNDEBUG
 
 'C++ Compiler options
-MX2_CPP_OPTS_EMSCRIPTEN=-std=c++11 -s USE_SDL=2 -s TOTAL_MEMORY=268435456 -s DISABLE_EXCEPTION_CATCHING=1
-MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=-Os
+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=-Os -s ASSERTIONS=2
 MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3 -DNDEBUG
 
 
@@ -110,6 +110,14 @@ MX2_ANDROID_APP_ABI=armeabi-v7a x86
 '
 MX2_ANDROID_APP_PLATFORM=android-14
 
+'Android app compiler Compiler flags
+'
+MX2_ANDROID_APP_CFLAGS=-std=gnu99 -fno-stack-protector -w
+MX2_ANDROID_APP_CPPFLAGS=-std=c++11 -fno-stack-protector -frtti -fexceptions -w
+
+'Controls version of STL used by android apps.
+'
+MX2_ANDROID_APP_STL=c++_static
 
 '***** RASPBIAN *****