Adding new fixes for latest version of hxtools and hxlibc

buildfiles/iphone/PROJ/haxe/Build.hxml

@@ -2,4 +2,5 @@
 -D iphone
 -D ios
 --macro allowPackage("flash")
---macro keep("::APP_MAIN::")
+--macro keep("::APP_MAIN::")
+-D no-compilation

buildfiles/iphone/PROJ/haxe/makefile

@@ -19,14 +19,16 @@ default: debug_print
 
 ifeq ("$(BUILD_STYLE)","Debug")
    DEBUG := -debug
+   DEF_DEBUG := -Ddebug
    CONFIG := Debug
 else
    DEBUG :=
+   DEF_DEBUG :=
    CONFIG := Release
 endif
 
 ifeq ("$(CLANG_ENABLE_OBJC_ARC)", "YES")
-   HXCPP_CLANG := -D HXCPP_CLANG -D OBJC_ARC
+   HXCPP_CLANG := -DHXCPP_CLANG -DOBJC_ARC
 else
    HXCPP_CLANG := 
 endif
@@ -47,19 +49,22 @@ export HXCPP_COMPILE_THREADS := 2
 
 build-haxe-i386:
 	@echo "Haxe simulator build CONFIG : $(CONFIG)"
-	haxe Build.hxml -D simulator -cpp build/$(CONFIG) $(DEBUG) $(HXCPP_CLANG)
+	haxe Build.hxml -D simulator -cpp build/$(CONFIG) $(DEBUG)
+	cd build/$(CONFIG); haxelib run hxlibc Build.xml -Dios -Diphone -Dsimulator $(DEF_DEBUG) $(HXCPP_CLANG)
 	cp $(LIB_BASE).iphonesim.a ../lib/i386$(LIB_DEST)
 	touch ../Classes/Main.mm
 
 build-haxe-armv6:
 	@echo "Haxe armv6 build CONFIG : $(CONFIG)"
-	haxe Build.hxml -D HXCPP_ARMV6 -cpp build/$(CONFIG) $(DEBUG) $(HXCPP_CLANG)
+	haxe Build.hxml -D HXCPP_ARMV6 -cpp build/$(CONFIG) $(DEBUG)
+	cd build/$(CONFIG); haxelib run hxlibc Build.xml -Dios -Diphone -DHXCPP_ARMV6 $(DEF_DEBUG) $(HXCPP_CLANG)
 	cp $(LIB_BASE).iphoneos.a ../lib/armv6$(LIB_DEST)
 	touch ../Classes/Main.mm
 
 build-haxe-armv7:
 	@echo "Haxe armv7 build CONFIG : $(CONFIG)"
-	haxe Build.hxml -D HXCPP_ARMV7 -cpp build/$(CONFIG) $(DEBUG) $(HXCPP_CLANG)
+	haxe Build.hxml -D HXCPP_ARMV7 -cpp build/$(CONFIG) $(DEBUG)
+	cd build/$(CONFIG); haxelib run hxlibc Build.xml -Dios -Diphone -DHXCPP_ARMV7 $(DEF_DEBUG) $(HXCPP_CLANG)
 	cp $(LIB_BASE).iphoneos-v7.a ../lib/armv7$(LIB_DEST)
 	touch ../Classes/Main.mm
 

examples/SimpleOpenGL/src/Main.hx

@@ -71,17 +71,6 @@ class Main {
         //Called by lime 
     public function onkeydown(_event:Dynamic) {
         // trace(_event);
-        //49
-
-        if(_event.value == 49) {
-           trace( "selected : " + lib.window.fileDialogOpen('open file!!!',' oenenenfelkes') );
-        }
-        if(_event.value == 50) {
-             trace( "selected : " + lib.window.fileDialogSave('select a save file','saveeeee') );
-        }
-        if(_event.value == 51) {
-             trace( "selected : " + lib.window.fileDialogFolder('Select folder2222','select a folder!!') );
-        }
     }    
 
         //Called by lime 

include.xml

@@ -3,17 +3,15 @@
 
 	<haxedef name="lime_html5" if="html5" />
 	<haxedef name="lime_native" if="native" />
-	<!-- <haxeflag name="-D" value="I_LIKE_SQUIRRELS" /> -->
+	<haxedef name="no-compilation" />
 
 	<section unless="display">
 
-		<ndll name="std" haxelib="hxcpp" unless="neko" />
+		<haxelib name="hxlibc" if="cpp" />
-		<ndll name="regexp" haxelib="hxcpp" unless="neko" />
-		<ndll name="zlib" haxelib="hxcpp" unless="neko" />
 		
 		<ndll name="openal" register="false" if="android" />
 		<ndll name="libfreetype" register="false" if="emscripten" />
-		
+
 		<ndll name="curl_ssl" register="false" if="ios" />
 		<ndll name="png" register="false" if="ios" />
 		<ndll name="jpeg" register="false" if="ios" />
@@ -21,9 +19,9 @@
 		<ndll name="ogg" register="false" if="ios" />
 		<ndll name="vorbis" register="false" if="ios" />
 		
-		<ndll name="nme" />		
+		<ndll name="nme" />
 
-		<include haxelib="openfl-tools" />
+		<include haxelib="hxtools" />
 		
 	</section>
 	

lime/utils/ArrayBufferView.hx

@@ -85,13 +85,13 @@ package lime.utils;
             }
             
             
-            inline public function getFloat32 (position:Int):Float {
+            inline public function getFloat32(position:Int):Float {
                 
                 #if cpp
                 untyped return __global__.__hxcpp_memory_get_float (bytes, position + byteOffset);
                 #else
                 buffer.position = position + byteOffset;
-                return buffer.readFloat ();
+                return buffer.readFloat();
                 #end
                 
             }

lime/utils/Float32Array.hx

@@ -23,6 +23,7 @@ package lime.utils;
             if (Std.is (bufferOrArray, Int)) {
                 
                 super (Std.int (bufferOrArray) * BYTES_PER_ELEMENT);
+                this.length = bufferOrArray;
                 
             } else if (Std.is (bufferOrArray, Array)) {
                 
@@ -76,9 +77,8 @@ package lime.utils;
         
             
         public function clear() {
-            // this.buffer.writeBytes(haxe.io.Bytes.alloc(0), 0, 0);
             length = 0;
-        }        
+        }
         
         public static function fromMatrix (matrix:Matrix3D):Float32Array {
             return new Float32Array (matrix.rawData);

lime/utils/native/ByteArray.hx

@@ -287,7 +287,7 @@ class ByteArray extends Bytes #if !haxe3 , #end implements ArrayAccess<Int> #if
    public function readFloat():Float 
    {  
       #if !lime_html5
-     
+
          if (position + 4 > length)
             ThrowEOFi();
 

script/CHANGES.md

@@ -1,6 +1,7 @@
 
 ### lime build tools version changes
 
+_1.0.3_ Migrating to latest hxtools from openfl-tools
 _1.0.2_ Added code to handle injecting default project names, adding separate luxe/lime build files.
 _1.0.1_ Added helpers for `create` and `copy`
 _1.0.0_ Initial tools to forward commands to openfl-tools

script/build.lime.hxml

@@ -1,5 +1,5 @@
 -main RunScript
 -neko ../run.n
--lib openfl-tools
+-lib hxtools
 -D pathtools
 -cp src

script/build.luxe.hxml

@@ -1,6 +1,6 @@
 -main RunScript
 -neko ../../luxe/run.n
--lib openfl-tools
+-lib hxtools
 -D pathtools
 -D luxe
 -cp src

script/src/RunScript.hx

@@ -114,13 +114,13 @@ class RunScript {
 			} //if there is an xml mentioned
 		} //for each argument
 
-		if(!explicit_project) {
+		// if(!explicit_project) {
-			#if luxe
+		// 	#if luxe
-				args.insert(1,'project.luxe.xml');
+		// 		args.insert(1,'project.luxe.xml');
-			#else 
+		// 	#else 
-				args.insert(1,'project.lime.xml');
+		// 		args.insert(1,'project.lime.xml');
-			#end
+		// 	#end
-		}
+		// }
 
 		return args;
 
@@ -144,8 +144,8 @@ class RunScript {
 				var args = append_project_file(args);
 
 					//make a full command line
-				var full_args = [ "run", "openfl-tools" ].concat(args);
+				var full_args = [ "run", "hxtools" ].concat(args);
-					//enforce the folder to the current on
+					//enforce the folder to the current one
 				Sys.setCwd(cwd);
 					//and then execute
 				return Sys.command("haxelib", full_args);
@@ -155,7 +155,7 @@ class RunScript {
 		} else {
 			Sys.println("");
 			
-			var version = "1.0.2";
+			var version = "1.0.3";
 
 			#if luxe
 				Sys.println("  luxe build tools " + version);