Mark Sibly 9 anni fa
parent
commit
1c7f0de986
6 ha cambiato i file con 15 aggiunte e 14 eliminazioni
  1. 5 4
      bin/env_windows.txt
  2. BIN
      bin/mx2cc_linux
  3. BIN
      bin/mx2cc_macos
  4. BIN
      bin/mx2cc_windows.exe
  5. 4 4
      scripts/common.bat
  6. 6 6
      scripts/common.sh

+ 5 - 4
bin/env_windows.txt

@@ -16,6 +16,7 @@ GCC_EXEC_PREFIX=
 
 'Mingw-64 for 32 bit apps.
 PATH=${MX2_HOME}\devtools\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;${PATH}
+PATH=${MX2_HOME}\devtools\i686-6.2.0-posix-dwarf-rt_v5-rev1\mingw32\bin;${PATH}
 
 'Mingw-64 for 64 bit apps, but don't use 'coz no 64 bit angle lib yet.
 'PATH=${MX2_HOME}\devtools\x86_64-5.3.0-posix-seh-rt_v4-rev0\mingw64\bin;${PATH}
@@ -24,17 +25,17 @@ MX2_GCC_TOOLS_WINDOWS=${MX2_HOME}\devtools\i686-5.3.0-posix-dwarf-rt_v4-rev0\min
 
 'Linker options
 MX2_LD_OPTS_WINDOWS=-static -m32
-MX2_LD_OPTS_WINDOWS_DEBUG='-g
-MX2_LD_OPTS_WINDOWS_RELEASE=-s ' -Wl,--gc-sections 
+MX2_LD_OPTS_WINDOWS_DEBUG=
+MX2_LD_OPTS_WINDOWS_RELEASE=-O3 ' -Wl,--gc-sections 
 
 'C Compiler options
 MX2_CC_OPTS_WINDOWS=-std=gnu99 -m32
-MX2_CC_OPTS_WINDOWS_DEBUG='-g
+MX2_CC_OPTS_WINDOWS_DEBUG=
 MX2_CC_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG ' -fdata-sections -ffunction-sections
 
 'C++ Compiler options
 MX2_CPP_OPTS_WINDOWS=-std=c++11 -m32
-MX2_CPP_OPTS_WINDOWS_DEBUG='-g
+MX2_CPP_OPTS_WINDOWS_DEBUG=
 MX2_CPP_OPTS_WINDOWS_RELEASE=-O3 -DNDEBUG ' -fvtable-gc -fdata-sections -ffunction-sections
 
 

BIN
bin/mx2cc_linux


BIN
bin/mx2cc_macos


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.9\windows_release\mx2cc.exe
-set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.0.9\raspbian_release\mx2cc
+set mx2cc_new=..\src\mx2cc\mx2cc.buildv1.0.91\windows_release\mx2cc.exe
+set mx2cc_raspbian_new=..\src\mx2cc\mx2cc.buildv1.0.91\raspbian_release\mx2cc
 
 set ted2=..\bin\ted2_windows
-set ted2_new=..\src\ted2\ted2.buildv1.0.9\windows_release
+set ted2_new=..\src\ted2\ted2.buildv1.0.91\windows_release
 
 set launcher="..\Monkey2 (Windows).exe"
-set launcher_new=..\src\launcher\launcher.buildv1.0.9\windows_release\launcher.exe
+set launcher_new=..\src\launcher\launcher.buildv1.0.91\windows_release\launcher.exe

+ 6 - 6
scripts/common.sh

@@ -9,13 +9,13 @@ launcher_new=""
 if [ "$OSTYPE" = "linux-gnu" ]
 then
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.9/linux_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.91/linux_release/mx2cc"
 	
 	ted2="../bin/ted2_linux"
-	ted2_new="../src/ted2/ted2.buildv1.0.9/linux_release"
+	ted2_new="../src/ted2/ted2.buildv1.0.91/linux_release"
 	
 	launcher="../Monkey2 (Linux)"
-	launcher_new="../src/launcher/launcher.buildv1.0.9/linux_release/launcher"
+	launcher_new="../src/launcher/launcher.buildv1.0.91/linux_release/launcher"
 	
 elif [ "$OSTYPE" = "linux-gnueabihf" ]
 then
@@ -29,11 +29,11 @@ then
 	launcher_new="../src/launcher/launcher.buildv1.0.9/raspbian_release/launcher"
 else
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.9/macos_release/mx2cc"
+	mx2cc_new="../src/mx2cc/mx2cc.buildv1.0.91/macos_release/mx2cc"
 	
 	ted2="../bin/ted2_macos.app"
-	ted2_new="../src/ted2/ted2.buildv1.0.9/macos_release/ted2.app"
+	ted2_new="../src/ted2/ted2.buildv1.0.91/macos_release/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
-	launcher_new="../src/launcher/launcher.buildv1.0.9/macos_release/launcher.app"
+	launcher_new="../src/launcher/launcher.buildv1.0.91/macos_release/launcher.app"
 fi