浏览代码

Rebuilt binaries.

Mark Sibly 9 年之前
父节点
当前提交
a167338bee
共有 8 个文件被更改,包括 9 次插入9 次删除
  1. 2 2
      bin/env_macos.txt
  2. 1 1
      bin/env_windows.txt
  3. 二进制
      bin/mx2cc_linux
  4. 二进制
      bin/mx2cc_macos
  5. 二进制
      bin/mx2cc_windows.exe
  6. 4 4
      src/common.sh
  7. 1 1
      src/rebuildmx2cc.bat
  8. 1 1
      src/updatemx2cc.bat

+ 2 - 2
bin/env_macos.txt

@@ -24,12 +24,12 @@ MX2_LD_OPTS_DESKTOP_DEBUG=-O0 '-g
 MX2_LD_OPTS_DESKTOP_RELEASE=-O3
 
 'C compiler options
-MX2_CC_OPTS_DESKTOP=-std=gnu99 -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses
+MX2_CC_OPTS_DESKTOP=-std=gnu99 -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-parentheses-equality
 MX2_CC_OPTS_DESKTOP_DEBUG=-O0 '-g
 MX2_CC_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG
 
 'C++ compiler options
-MX2_CPP_OPTS_DESKTOP=-std=c++11 -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-null-character
+MX2_CPP_OPTS_DESKTOP=-std=c++11 -Wno-deprecated-declarations -Wno-tautological-pointer-compare -Wno-undefined-bool-conversion -Wno-int-to-void-pointer-cast -Wno-inconsistent-missing-override -Wno-logical-op-parentheses -Wno-parentheses-equality
 MX2_CPP_OPTS_DESKTOP_DEBUG=-O0 '-g
 MX2_CPP_OPTS_DESKTOP_RELEASE=-O3 -DNDEBUG
 

+ 1 - 1
bin/env_windows.txt

@@ -19,7 +19,7 @@ PATH=${MX2_HOME}\devtools\i686-5.3.0-posix-dwarf-rt_v4-rev0\mingw32\bin;${PATH}
 MX2_BUILD_DIR_DESKTOP_DEBUG=desktop_debug_windows
 MX2_BUILD_DIR_DESKTOP_RELEASE=desktop_release_windows
 
-MX2_LD_OPTS_DESKTOP=-m32
+MX2_LD_OPTS_DESKTOP=-m32 -static
 MX2_LD_OPTS_DESKTOP_DEBUG=
 MX2_LD_OPTS_DESKTOP_RELEASE=-s
 

二进制
bin/mx2cc_linux


二进制
bin/mx2cc_macos


二进制
bin/mx2cc_windows.exe


+ 4 - 4
src/common.sh

@@ -7,12 +7,12 @@ ted2_new=""
 if [ "$OSTYPE" = "linux-gnu" ]
 then
 	mx2cc="../bin/mx2cc_linux"
-	mx2cc_new="mx2new/mx2cc.buildv006/desktop_release_linux/mx2cc"
+	mx2cc_new="mx2new/mx2cc.buildv008/desktop_release_linux/mx2cc"
 	ted2="../bin/ted2_linux"
-	ted2_new="ted2/ted2.buildv006/desktop_release_linux/ted2"
+	ted2_new="ted2/ted2.buildv008/desktop_release_linux/ted2"
 else
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="mx2new/mx2cc.buildv006/desktop_release_macos/mx2cc.app/Contents/MacOS/mx2cc"
+	mx2cc_new="mx2new/mx2cc.buildv008/desktop_release_macos/mx2cc.app/Contents/MacOS/mx2cc"
 	ted2="../bin/ted2.app"
-	ted2_new="ted2/ted2.buildv006/desktop_release_macos/ted2.app"
+	ted2_new="ted2/ted2.buildv008/desktop_release_macos/ted2.app"
 fi

+ 1 - 1
src/rebuildmx2cc.bat

@@ -6,4 +6,4 @@ echo ***** Rebuilding mx2cc *****
 echo.
 
 ..\bin\mx2cc_windows makeapp -clean -config=release mx2new/mx2cc.monkey2
-copy mx2new\mx2cc.buildv006\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+copy mx2new\mx2cc.buildv008\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe

+ 1 - 1
src/updatemx2cc.bat

@@ -6,4 +6,4 @@ echo ***** Updating mx2cc *****
 echo.
 
 ..\bin\mx2cc_windows makeapp -config=release mx2new/mx2cc.monkey2
-copy mx2new\mx2cc.buildv006\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+copy mx2new\mx2cc.buildv008\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe