kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for console targets

Browse Source
This commit is contained in:
Joshua Granick
2015-01-20 10:28:39 -08:00
parent 057ae36d69
commit db7f1f9f4f
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include.xml
View File

@@ -18,6 +18,12 @@
<haxelib name="nodejs" if="nodejs" /> <haxelib name="nodejs" if="nodejs" />
<haxelib name="format" if="java" /> <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"> <section unless="display || lime-legacy">
<ndll name="std" haxelib="hxcpp" if="cpp" /> <ndll name="std" haxelib="hxcpp" if="cpp" />
@@ -44,12 +50,6 @@
<!-- <include haxelib="aether" unless="openfl" /> <!-- <include haxelib="aether" unless="openfl" />
<haxelib name="aether" if="setup" /> --> <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-curl" unless="lime-console || emscripten" />
<haxedef name="lime-opengl" unless="lime-console" /> <haxedef name="lime-opengl" unless="lime-console" />
<haxedef name="lime-openal" unless="lime-console || static_link || emscripten" /> <haxedef name="lime-openal" unless="lime-console || static_link || emscripten" />

2
tools/CommandLineTools.hx
View File

@@ -558,6 +558,8 @@ class CommandLineTools {
platform = new EmscriptenPlatform (command, project, targetFlags); platform = new EmscriptenPlatform (command, project, targetFlags);
default:
} }
if (platform != null) { if (platform != null) {

6
tools/project/HXProject.hx
View File

@@ -175,6 +175,12 @@ class HXProject {
} }
default:
// TODO: Better handle platform type for pluggable targets
platformType = PlatformType.CONSOLE;
} }
meta = ObjectHelper.copyFields (defaultMeta, {}); meta = ObjectHelper.copyFields (defaultMeta, {});

1
tools/project/Platform.hx
View File

@@ -15,5 +15,6 @@ package project;
var WINDOWS = "windows"; var WINDOWS = "windows";
var WEBOS = "webos"; var WEBOS = "webos";
var EMSCRIPTEN = "emscripten"; var EMSCRIPTEN = "emscripten";
var CUSTOM = null;
} }

1
tools/project/PlatformType.hx
View File

@@ -6,5 +6,6 @@ enum PlatformType {
DESKTOP; DESKTOP;
MOBILE; MOBILE;
WEB; WEB;
CONSOLE;
} }

6
tools/project/ProjectXMLParser.hx
View File

@@ -72,6 +72,10 @@ class ProjectXMLParser extends HXProject {
defines.set ("web", "1"); defines.set ("web", "1");
case CONSOLE:
defines.set ("console", "1");
} }
if (targetFlags.exists ("neko")) { if (targetFlags.exists ("neko")) {
@@ -93,7 +97,7 @@ class ProjectXMLParser extends HXProject {
defines.set ("html5", "1"); 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 ("native", "1");
defines.set ("cpp", "1"); defines.set ("cpp", "1");