Make sure is64 is true when cross compiling for HL.

openfl · Apr 16, 2023 · eee2220 · eee2220
1 parent 08d6340
commit eee2220
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/tools/platforms/LinuxPlatform.hx b/tools/platforms/LinuxPlatform.hx
@@ -140,11 +140,6 @@ class LinuxPlatform extends PlatformTarget
 		{
 			targetType = "neko";
 		}
-		else if (project.targetFlags.exists("hl"))
-		{
-			targetType = "hl";
-			is64 = true;
-		}
 		else if (project.targetFlags.exists("nodejs"))
 		{
 			targetType = "nodejs";
@@ -153,9 +148,10 @@ class LinuxPlatform extends PlatformTarget
 		{
 			targetType = "java";
 		}
-		else if (project.target != (cast System.hostPlatform))
+		else if (project.targetFlags.exists("hl") || project.target != (cast System.hostPlatform))
 		{
 			targetType = "hl";
+			is64 = true;
 		}
 		else
 		{

diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx
@@ -134,11 +134,6 @@ class MacPlatform extends PlatformTarget
 		{
 			targetType = "neko";
 		}
-		else if (project.targetFlags.exists("hl"))
-		{
-			targetType = "hl";
-			is64 = true;
-		}
 		else if (project.targetFlags.exists("java"))
 		{
 			targetType = "java";
@@ -151,9 +146,10 @@ class MacPlatform extends PlatformTarget
 		{
 			targetType = "cs";
 		}
-		else if (project.target != (cast System.hostPlatform))
+		else if (project.targetFlags.exists("hl") || project.target != (cast System.hostPlatform))
 		{
 			targetType = "hl";
+			is64 = true;
 		}
 		else
 		{

diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx
@@ -142,11 +142,6 @@ class WindowsPlatform extends PlatformTarget
 		{
 			targetType = "neko";
 		}
-		else if (project.targetFlags.exists("hl"))
-		{
-			targetType = "hl";
-			is64 = !project.flags.exists("32");
-		}
 		else if (project.targetFlags.exists("cppia"))
 		{
 			targetType = "cppia";
@@ -168,9 +163,10 @@ class WindowsPlatform extends PlatformTarget
 		{
 			targetType = "winrt";
 		}
-		else if (project.target != (cast System.hostPlatform))
+		else if (project.targetFlags.exists("hl") || project.target != (cast System.hostPlatform))
 		{
 			targetType = "hl";
+			is64 = !project.flags.exists("32");
 		}
 		else
 		{