From db7f1f9f4fa4167cfbec6d0dcbf9f004e9e6ec8f Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 20 Jan 2015 10:28:39 -0800
Subject: [PATCH] Updates for console targets

---
 include.xml                       | 12 ++++++------
 tools/CommandLineTools.hx         |  2 ++
 tools/project/HXProject.hx        |  6 ++++++
 tools/project/Platform.hx         |  1 +
 tools/project/PlatformType.hx     |  1 +
 tools/project/ProjectXMLParser.hx |  6 +++++-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/include.xml b/include.xml
index d08d5d493..79a3c8f46 100644
--- a/include.xml
+++ b/include.xml
@@ -18,6 +18,12 @@
 	<haxelib name="nodejs" if="nodejs" />
 	<haxelib name="format" if="java" />
 	
+	<target name="wiiu" handler="lime-wiiu" />
+	<haxelib name="lime-wiiu" if="wiiu" />
+	
+	<target name="console-pc" handler="lime-console-pc" />
+	<haxelib name="lime-console-pc" if="console-pc" />
+	
 	<section unless="display || lime-legacy">
 		
 		<ndll name="std" haxelib="hxcpp" if="cpp" />
@@ -44,12 +50,6 @@
 		<!-- <include haxelib="aether" unless="openfl" />
 		<haxelib name="aether" if="setup" /> -->
 		
-		<target name="wiiu" handler="lime-wiiu" />
-		<haxelib name="lime-wiiu" if="wiiu" />
-		
-		<target name="console-pc" handler="lime-console-pc" />
-		<haxelib name="lime-console-pc" if="console-pc" />
-		
 		<haxedef name="lime-curl" unless="lime-console || emscripten" />
 		<haxedef name="lime-opengl" unless="lime-console" />
 		<haxedef name="lime-openal" unless="lime-console || static_link || emscripten" />
diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index a35f19d33..fa3d1c397 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -558,6 +558,8 @@ class CommandLineTools {
 					
 					platform = new EmscriptenPlatform (command, project, targetFlags);
 				
+				default:
+				
 			}
 			
 			if (platform != null) {
diff --git a/tools/project/HXProject.hx b/tools/project/HXProject.hx
index 0641fa655..508e3888f 100644
--- a/tools/project/HXProject.hx
+++ b/tools/project/HXProject.hx
@@ -175,6 +175,12 @@ class HXProject {
 					
 				}
 			
+			default:
+				
+				// TODO: Better handle platform type for pluggable targets
+				
+				platformType = PlatformType.CONSOLE;
+			
 		}
 		
 		meta = ObjectHelper.copyFields (defaultMeta, {});
diff --git a/tools/project/Platform.hx b/tools/project/Platform.hx
index 2f21042c9..d2ba29e06 100644
--- a/tools/project/Platform.hx
+++ b/tools/project/Platform.hx
@@ -15,5 +15,6 @@ package project;
 	var WINDOWS = "windows";
 	var WEBOS = "webos";
 	var EMSCRIPTEN = "emscripten";
+	var CUSTOM = null;
 
 }
\ No newline at end of file
diff --git a/tools/project/PlatformType.hx b/tools/project/PlatformType.hx
index 3c250a2b5..daf5d3dfd 100644
--- a/tools/project/PlatformType.hx
+++ b/tools/project/PlatformType.hx
@@ -6,5 +6,6 @@ enum PlatformType {
 	DESKTOP;
 	MOBILE;
 	WEB;
+	CONSOLE;
 
 }
\ No newline at end of file
diff --git a/tools/project/ProjectXMLParser.hx b/tools/project/ProjectXMLParser.hx
index dc7f8ef82..710370382 100644
--- a/tools/project/ProjectXMLParser.hx
+++ b/tools/project/ProjectXMLParser.hx
@@ -72,6 +72,10 @@ class ProjectXMLParser extends HXProject {
 				
 				defines.set ("web", "1");
 			
+			case CONSOLE:
+				
+				defines.set ("console", "1");
+			
 		}
 		
 		if (targetFlags.exists ("neko")) {
@@ -93,7 +97,7 @@ class ProjectXMLParser extends HXProject {
 			
 			defines.set ("html5", "1");
 			
-		} else if (targetFlags.exists ("cpp") || ((platformType == PlatformType.MOBILE || platformType == PlatformType.DESKTOP) && !targetFlags.exists("html5")) || target == Platform.EMSCRIPTEN) {
+		} else if (targetFlags.exists ("cpp") || ((platformType != PlatformType.WEB) && !targetFlags.exists("html5")) || target == Platform.EMSCRIPTEN) {
 			
 			defines.set ("native", "1");
 			defines.set ("cpp", "1");