Merge branch '8.1.0-Dev' into 8.2.0-Dev

tools/CommandLineTools.hx

@@ -1180,7 +1180,7 @@ class CommandLineTools
 					if ((extension == "lime" && file != "include.lime")
 						|| (extension == "nmml" && file != "include.nmml")
 						|| (extension == "xml" && file != "include.xml")
-						|| extension == "hxp")
+						|| (extension == "hxp" && file != "include.hxp"))
 					{
 						matches.get(extension).push(path);
 					}

tools/RunScript.hx

@@ -199,6 +199,23 @@ class RunScript
 			}
 		}
 
+		if (args.indexOf("-eval") >= 0)
+		{
+			args.remove("-eval");
+			Log.info("Experimental: executing `lime " + args.slice(0, args.length - 1).join(" ")
+				+ "` using Eval (https://haxe.org/blog/eval/)");
+
+			var args = [
+				"-D", "lime",
+				"-cp", "tools",
+				"-cp", "tools/platforms",
+				"-cp", "src",
+				"-lib", "format",
+				"-lib", "hxp",
+				"--run", "CommandLineTools"].concat(args);
+			Sys.exit(runCommand("", "haxe", args));
+		}
+
 		if (!FileSystem.exists("tools/tools.n") || args.indexOf("-rebuild") > -1)
 		{
 			rebuildTools();

tools/platforms/IOSPlatform.hx

@@ -91,7 +91,7 @@ class IOSPlatform extends PlatformTarget
 				title: ""
 			};
 
-		defaults.architectures = [Architecture.ARMV7, Architecture.ARM64];
+		defaults.architectures = [Architecture.ARM64];
 		defaults.window.width = 0;
 		defaults.window.height = 0;
 		defaults.window.fullscreen = true;
@@ -250,7 +250,7 @@ class IOSPlatform extends PlatformTarget
 
 		if (architectures == null || architectures.length == 0)
 		{
-			architectures = [Architecture.ARMV7, Architecture.ARM64];
+			architectures = [Architecture.ARM64];
 		}
 
 		if (project.config.getString("ios.device", "universal") == "universal" || project.config.getString("ios.device") == "iphone")
@@ -487,11 +487,11 @@ class IOSPlatform extends PlatformTarget
 
 		var commands = [];
 
-		if (armv6) commands.push(["-Dios", "-DHXCPP_CPP11"]);
+		if (armv6) commands.push(["-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV6"]);
 		if (armv7) commands.push(["-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7"]);
 		if (armv7s) commands.push(["-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARMV7S"]);
 		if (arm64) commands.push(["-Dios", "-DHXCPP_CPP11", "-DHXCPP_ARM64"]);
-		if (i386) commands.push(["-Dios", "-Dsimulator", "-DHXCPP_CPP11"]);
+		if (i386) commands.push(["-Dios", "-Dsimulator", "-DHXCPP_M32", "-DHXCPP_CPP11"]);
 		if (x86_64) commands.push(["-Dios", "-Dsimulator", "-DHXCPP_M64", "-DHXCPP_CPP11"]);
 
 		if (arc)

tools/tools.hxml

@@ -9,4 +9,3 @@
 -lib hxp
 #-lib svg
 -D optional-cffi
--D no-inline