Pārlūkot izejas kodu

Updated binaries.

Mark Sibly 9 gadi atpakaļ
vecāks
revīzija
ab03f86a81

+ 7 - 13
bin/env_windows.txt

@@ -1,14 +1,8 @@
 
 '***** COMMON *****
 
-MX2_VERSION=002
-MX2_BUILDV=002
-
 MX2_BUILD_VERBOSE=0
 
-MX2_MODULES_VERSION=003
-MX2_PRODUCT_VERSION=003
-
 '***** DESKTOP *****
 
 GCC_EXEC_PREFIX=
@@ -17,17 +11,17 @@ PATH=${MX2_HOME}\devtools\TDM-GCC-64-4.9.2\bin;${PATH}
 MX2_BUILD_DIR_DESKTOP_DEBUG=desktop_debug_windows
 MX2_BUILD_DIR_DESKTOP_RELEASE=desktop_release_windows
 
-MX2_LD_OPTS_DESKTOP=-m32	'-mwindows
+MX2_LD_OPTS_DESKTOP=-m32
 MX2_LD_OPTS_DESKTOP_DEBUG=
-MX2_LD_OPTS_DESKTOP_RELEASE=-O3 -s
+MX2_LD_OPTS_DESKTOP_RELEASE=-s
 
 MX2_CC_OPTS_DESKTOP=-std=gnu99 -m32
-MX2_CC_OPTS_DESKTOP_DEBUG=-g
-MX2_CC_OPTS_DESKTOP_RELEASE=-O3
+MX2_CC_OPTS_DESKTOP_DEBUG=
+MX2_CC_OPTS_DESKTOP_RELEASE=-Os -DNDEBUG
 
 MX2_CPP_OPTS_DESKTOP=-std=c++11 -m32
-MX2_CPP_OPTS_DESKTOP_DEBUG=-g
-MX2_CPP_OPTS_DESKTOP_RELEASE=-O3
+MX2_CPP_OPTS_DESKTOP_DEBUG=
+MX2_CPP_OPTS_DESKTOP_RELEASE=-Os -DNDEBUG
 
 '***** EMSCRIPTEN *****
 
@@ -56,7 +50,7 @@ MX2_LD_OPTS_EMSCRIPTEN=-s TOTAL_MEMORY=33554432 -s DISABLE_EXCEPTION_CATCHING=1
 MX2_LD_OPTS_EMSCRIPTEN_DEBUG=-O2
 MX2_LD_OPTS_EMSCRIPTEN_RELEASE=-O3
 
-MX2_CC_OPTS_EMSCRIPTEN=-std=gnu99 -s TOTAL_MEMORY=33554432 -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 TOTAL_MEMORY=33554432 -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=-O2
 MX2_CC_OPTS_EMSCRIPTEN_RELEASE=-O3
 

BIN
bin/mx2cc_linux


BIN
bin/mx2cc_macos


BIN
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.buildv004/desktop_release_linux/mx2cc"
+	mx2cc_new="mx2new/mx2cc.buildv005/desktop_release_linux/mx2cc"
 	ted2="../bin/ted2_linux"
-	ted2_new="ted2/ted2.buildv004/desktop_release_linux/ted2"
+	ted2_new="ted2/ted2.buildv005/desktop_release_linux/ted2"
 else
 	mx2cc="../bin/mx2cc_macos"
-	mx2cc_new="mx2new/mx2cc.buildv004/desktop_release_macos/mx2cc.app/Contents/MacOS/mx2cc"
+	mx2cc_new="mx2new/mx2cc.buildv005/desktop_release_macos/mx2cc.app/Contents/MacOS/mx2cc"
 	ted2="../bin/ted2.app"
-	ted2_new="ted2/ted2.buildv004/desktop_release_macos/ted2.app"
+	ted2_new="ted2/ted2.buildv005/desktop_release_macos/ted2.app"
 fi

+ 22 - 16
src/mx2new/test.monkey2

@@ -1,26 +1,32 @@
 
 Namespace test
 
-'#Import "<std.monkey2>"
-
-Class B
+Function Test:Float()
+	Return 10
 End
 
-Struct Test
-	Field z:Int
-	Field y:Int
-	Field x:Int
-	Field a:Int
-	Field b:Int
-	Field c:Int
-	Field m:B
-End
+Global GlobalColor:Color
 
-Class C
-	Field t:=New Test[10]
+Struct Color
+
+	Field r:Float
+	Field g:Float
+	Field b:Float
+	Field a:Float=1
+	
+	Method New()
+		a=Test()
+	End
+	
 End
 
 Function Main()
-	Local c:=New C
-	c.t[0].x=10
+
+	Local color:Color
+	
+	Print color.a
+	
+	color=New Color
+	
+	Print color.a
 End

+ 2 - 2
src/rebuildmx2cc.bat

@@ -2,8 +2,8 @@
 echo off
 
 echo.
-echo ***** Updating mx2cc *****
+echo ***** Rebuilding mx2cc *****
 echo.
 
 ..\bin\mx2cc_windows makeapp -clean -config=release mx2new/mx2cc.monkey2
-copy mx2new\mx2cc.buildv004\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+copy mx2new\mx2cc.buildv005\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.buildv004\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe
+copy mx2new\mx2cc.buildv005\desktop_release_windows\mx2cc.exe ..\bin\mx2cc_windows.exe