Browse Source

Updated binaries to v1.0.7

Mark Sibly 9 years ago
parent
commit
0c7a66ba36
7 changed files with 16 additions and 16 deletions
  1. 3 3
      bin/env_windows.txt
  2. BIN
      bin/mx2cc_linux
  3. BIN
      bin/mx2cc_macos
  4. BIN
      bin/mx2cc_raspbian
  5. BIN
      bin/mx2cc_windows.exe
  6. 4 4
      scripts/common.bat
  7. 9 9
      scripts/common.sh

+ 3 - 3
bin/env_windows.txt

@@ -42,17 +42,17 @@ MX2_CPP_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG ' -fvtable-gc -fdata-sections -ffuncti
 MX2_MSERVER="${MX2_HOME}\devtools\mserver-v86c\mserver_winnt.exe"
 
 'Linker options
-MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1
+MX2_LD_OPTS_EMSCRIPTEN=-s USE_SDL=2 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
 'C Compiler options
-MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -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=-std=gnu99 -s USE_SDL=2 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -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=-O0	'-O2
 MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3
 
 'C++ Compiler options
-MX2_CPP_OPTS_EMSCRIPTEN=-std=c++11 -s USE_SDL=2 -s FULL_ES2=1 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1 -Wno-undefined-bool-conversion
+MX2_CPP_OPTS_EMSCRIPTEN=-std=c++11 -s USE_SDL=2 -s TOTAL_MEMORY=67108864 -s DISABLE_EXCEPTION_CATCHING=1 ' -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1 -Wno-undefined-bool-conversion
 MX2_CPP_OPTS_EMSCRIPTEN_DEBUG=-O0	'-O2
 MX2_CPP_OPTS_EMSCRIPTEN_RELEASE=-O3
 

BIN
bin/mx2cc_linux


BIN
bin/mx2cc_macos


BIN
bin/mx2cc_raspbian


BIN
bin/mx2cc_windows.exe


+ 4 - 4
scripts/common.bat

@@ -1,10 +1,10 @@
 
 set mx2cc=..\bin\mx2cc_windows.exe
-set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.6\windows_release\mx2cc.exe
-set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.0.6\raspbian_release\mx2cc
+set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.7\windows_release\mx2cc.exe
+set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.0.7\raspbian_release\mx2cc
 
 set ted2=..\bin\ted2_windows
-set ted2_new=..\src\ted2\ted2.buildv1.0.6\windows_release
+set ted2_new=..\src\ted2\ted2.buildv1.0.7\windows_release
 
 set launcher="..\Monkey2 (Windows).exe"
-set launcher_new=..\src\launcher\launcher.buildv1.0.6\windows_release\launcher.exe
+set launcher_new=..\src\launcher\launcher.buildv1.0.7\windows_release\launcher.exe

+ 9 - 9
scripts/common.sh

@@ -10,34 +10,34 @@ if [ "$OSTYPE" = "linux-gnu" ]
 then
 
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.6/linux_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.7/linux_release/mx2cc"
 	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv1.0.6/linux_release"
+	ted2_new="../src/ted2/ted2.buildv1.0.7/linux_release"
 	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv1.0.6/linux_release/launcher"
+	launcher_new="../src/launcher/launcher.buildv1.0.7/linux_release/launcher"
 	
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
 
 	mx2cc="../bin/mx2cc_raspbian"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.6/raspbian_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.7/raspbian_release/mx2cc"
 	
 	ted2="../bin/ted2_raspbian"
-	ted2_new="../src/ted2/ted2.buildv1.0.6/raspbian_release"
+	ted2_new="../src/ted2/ted2.buildv1.0.7/raspbian_release"
 	
 	launcher="../Monkey2 (Raspbian)"
-	launcher_new="../src/launcher/launcher.buildv1.0.6/raspbian_release/launcher"
+	launcher_new="../src/launcher/launcher.buildv1.0.7/raspbian_release/launcher"
 	
 else
 
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.6/macos_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.7/macos_release/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv1.0.6/macos_release/ted2.app"
+	ted2_new="../src/ted2/ted2.buildv1.0.7/macos_release/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv1.0.6/macos_release/launcher.app"
+	launcher_new="../src/launcher/launcher.buildv1.0.7/macos_release/launcher.app"
 fi