首页 发现 帮助
登录
blitz
/
monkey2
镜像自地址 https://github.com/blitz-research/monkey2.git
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

WIP v2018.07

Mark Sibly 7 年之前
父节点
5626f5a6de
当前提交
d814ed3182
共有 4 个文件被更改，包括 9 次插入 和 10 次删除
合并视图 显示文件统计
  1. 3 3
      ABOUT.HTML
  2. 2 2
      bin/env_windows.txt
  3. 1 1
      modules/monkey/native/bbgc_mx.cpp
  4. 3 4
      src/createrelease/createrelease.monkey2

+ 3 - 3
ABOUT.HTML
查看文件 

@@ -45,11 +45,11 @@ a:hover{
 
 
 
 <body>
 
 <body>
 
 
 
-<h1>Monkey2 v2018.06</h1>
 
+<h1>Monkey2 v2018.07</h1>
 
 
 
-<h2>Mx2cc v1.1.14</h2>
 
+<h2>Mx2cc v1.1.15</h2>
 
 
 
-<h2>Ted2go v2.11</h2>
 
+<h2>Ted2go v2.12</h2>
 
 
 
 <p>Welcome to monkey2, an open source, user friendly, cross platform programming language by Mark Sibly.
 
 <p>Welcome to monkey2, an open source, user friendly, cross platform programming language by Mark Sibly.

+ 2 - 2
bin/env_windows.txt
查看文件 

@@ -5,9 +5,9 @@ MX2_THREADS=1
 
 
 
 'Use MX2_USE_MSVC=1 to force use of msvc, or MX2_USE_MSVC=0 to force use of mingw.
 
 'Use MX2_USE_MSVC=1 to force use of msvc, or MX2_USE_MSVC=0 to force use of mingw.
 
 '
 
 '
 
-'If MX2_USE_MSVC is not set, mx2cc will attempt to autodetect msvc.
 
+'If MX2_USE_MSVC is not set mx2cc will attempt to autodetect msvc.
 
 '
 
 '
 
-MX2_USE_MSVC=0
 
+'MX2_USE_MSVC=0
 
 
 
 'Build architecture: x86 or x64, x64 only working with msvc.
 
 'Build architecture: x86 or x64, x64 only working with msvc.
 
 '
 
 '

+ 1 - 1
modules/monkey/native/bbgc_mx.cpp
查看文件 

@@ -92,7 +92,7 @@ namespace bbGC{
 
 		if( inited ) return;
 
 		if( inited ) return;
 
 		inited=true;
 
 		inited=true;
 
 		
 		
-		bb_printf( "Initializing threaded GC\n" );
 
+//		bb_printf( "Initializing threaded GC\n" );
 
 		
 		
 		markedBit=1;
 
 		markedBit=1;
 
 		markedList=&markLists[0];
 
 		markedList=&markLists[0];

+ 3 - 4
src/createrelease/createrelease.monkey2
查看文件 

@@ -84,14 +84,13 @@ Function CopyFiles( dir:String )
 
 #else
 
 #else
 
 				Continue
 
 				Continue
 
 #endif
 
 #endif
 
-				
 			Else If file.Contains( ".buildv" )
 
 			Else If file.Contains( ".buildv" )
 
-				
+
 
 				If ExtractDir( dir )<>"modules/" Or Not file.EndsWith( ".buildv"+MX2CC_VERSION ) Continue
 
 				If ExtractDir( dir )<>"modules/" Or Not file.EndsWith( ".buildv"+MX2CC_VERSION ) Continue
 
-				
+
 
 			Else If dir.Contains( ".buildv" )
 
 			Else If dir.Contains( ".buildv" )
 
 				
 				
-				If Not file.EndsWith( "_mx" ) Continue
 
+				If Not src.Contains( "_mx" ) And Not src.EndsWith( "_mx" ) Continue
 
 				
 				
 				If file.StartsWith( "emscripten_" ) Continue
 
 				If file.StartsWith( "emscripten_" ) Continue
 
 				If file.StartsWith( "android_" ) Continue
 
 				If file.StartsWith( "android_" ) Continue