Use 'lime-legacy' instead of 'legacy' in order to prevent name collisions

This commit is contained in:
Joshua Granick
2014-09-24 14:26:49 -07:00
parent 5941b60570
commit ddb4b0ff8a
2 changed files with 10 additions and 6 deletions

View File

@@ -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" />

View File

@@ -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>