From ddb4b0ff8a6225b5dab4c63ca58b4db1c9ba0b0f Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Wed, 24 Sep 2014 14:26:49 -0700
Subject: [PATCH] Use 'lime-legacy' instead of 'legacy' in order to prevent
 name collisions

---
 include.xml       | 9 ++++++---
 project/Build.xml | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/include.xml b/include.xml
index 30610e842..cfe252147 100644
--- a/include.xml
+++ b/include.xml
@@ -8,11 +8,14 @@
 	
 	<set name="included" value="1" if="windows || mac || linux || ios || android || blackberry || tizen || firefoxos || html5 || flash" />
 	
-	<include path="legacy/include.xml" if="legacy" />
-	<templatePath name="templates" unless="legacy" />
+	<set name="lime-legacy" if="legacy || lime_legacy" />
+	<haxedef name="lime-legacy" if="lime-legacy" />
+	
+	<include path="legacy/include.xml" if="lime-legacy" />
+	<templatePath name="templates" unless="lime-legacy" />
 	<sample path="samples" unless="openfl" />
 	
-	<section unless="display || legacy">
+	<section unless="display || lime-legacy">
 		
 		<haxelib name="hxcpp" if="cpp" />
 		
diff --git a/project/Build.xml b/project/Build.xml
index c1e172454..373d07cf6 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -6,6 +6,7 @@
 	
 	<include name="${HXCPP}/build-tool/BuildCommon.xml" />
 	
+	<set name="lime-legacy" if="legacy || lime_legacy" />
 	<set name="ios" value="1" if="iphone" />
 	
 	<set name="LIME_CURL" value="1" unless="emscripten" />
@@ -253,12 +254,12 @@
 		
 	</target>
 	
-	<include name="../legacy/project/Build.xml" if="legacy" />
+	<include name="../legacy/project/Build.xml" if="lime-legacy" />
 	
 	<target id="default">
 		
-		<target id="lime" unless="legacy" />
-		<target id="lime-legacy" if="legacy" />
+		<target id="lime" unless="lime-legacy" />
+		<target id="lime-legacy" if="lime-legacy" />
 		
 	</target>