diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index 25fe2c3197..d9a0cf7e3b 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -1557,6 +1557,12 @@ class CommandLineTools
 			case "mac", "macos":
 				target = Platform.MAC;
 				overrides.haxedefs.set("macos", "");
+			case "windows":
+				target = Platform.WINDOWS;
+				overrides.haxedefs.set("windows", "");
+			case "linux":
+				target = Platform.LINUX;
+				overrides.haxedefs.set("linux", "");
 
 			case "rpi", "raspberrypi":
 				target = Platform.LINUX;
diff --git a/tools/platforms/LinuxPlatform.hx b/tools/platforms/LinuxPlatform.hx
index f1b98633f5..689d296d25 100644
--- a/tools/platforms/LinuxPlatform.hx
+++ b/tools/platforms/LinuxPlatform.hx
@@ -136,15 +136,10 @@ class LinuxPlatform extends PlatformTarget
 			is64 = false;
 		}
 
-		if (project.targetFlags.exists("neko") || project.target != cast System.hostPlatform)
+		if (project.targetFlags.exists("neko"))
 		{
 			targetType = "neko";
 		}
-		else if (project.targetFlags.exists("hl"))
-		{
-			targetType = "hl";
-			is64 = true;
-		}
 		else if (project.targetFlags.exists("nodejs"))
 		{
 			targetType = "nodejs";
@@ -153,6 +148,11 @@ class LinuxPlatform extends PlatformTarget
 		{
 			targetType = "java";
 		}
+		else if (project.targetFlags.exists("hl") || project.target != (cast System.hostPlatform))
+		{
+			targetType = "hl";
+			is64 = true;
+		}
 		else
 		{
 			targetType = "cpp";
diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx
index 4f80be65a0..9263245b03 100644
--- a/tools/platforms/MacPlatform.hx
+++ b/tools/platforms/MacPlatform.hx
@@ -130,15 +130,10 @@ class MacPlatform extends PlatformTarget
 			}
 		}
 
-		if (project.targetFlags.exists("neko") || project.target != cast System.hostPlatform)
+		if (project.targetFlags.exists("neko"))
 		{
 			targetType = "neko";
 		}
-		else if (project.targetFlags.exists("hl"))
-		{
-			targetType = "hl";
-			is64 = true;
-		}
 		else if (project.targetFlags.exists("java"))
 		{
 			targetType = "java";
@@ -151,6 +146,11 @@ class MacPlatform extends PlatformTarget
 		{
 			targetType = "cs";
 		}
+		else if (project.targetFlags.exists("hl") || project.target != (cast System.hostPlatform))
+		{
+			targetType = "hl";
+			is64 = true;
+		}
 		else
 		{
 			targetType = "cpp";
diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx
index 46433c6e9b..c9cbf7868e 100644
--- a/tools/platforms/WindowsPlatform.hx
+++ b/tools/platforms/WindowsPlatform.hx
@@ -138,15 +138,10 @@ class WindowsPlatform extends PlatformTarget
 		{
 			targetType = "winjs";
 		}
-		else if (project.targetFlags.exists("neko") || project.target != cast System.hostPlatform)
+		else if (project.targetFlags.exists("neko"))
 		{
 			targetType = "neko";
 		}
-		else if (project.targetFlags.exists("hl"))
-		{
-			targetType = "hl";
-			is64 = !project.flags.exists("32");
-		}
 		else if (project.targetFlags.exists("cppia"))
 		{
 			targetType = "cppia";
@@ -168,6 +163,11 @@ class WindowsPlatform extends PlatformTarget
 		{
 			targetType = "winrt";
 		}
+		else if (project.targetFlags.exists("hl") || project.target != (cast System.hostPlatform))
+		{
+			targetType = "hl";
+			is64 = !project.flags.exists("32");
+		}
 		else
 		{
 			targetType = "cpp";