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

Minor tweak

Browse Source
This commit is contained in:
Joshua Granick
2015-10-02 09:54:53 -07:00
parent 7e182981fe
commit 77cc799253
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lime/project/HXProject.hx
View File

@@ -159,7 +159,9 @@ class HXProject {
} }
} else if (target == Platform.TVOS) { } else if (target == Platform.TVOS) {
architectures = [ Architecture.ARM64 ]; architectures = [ Architecture.ARM64 ];
} else { } else {
architectures = [ Architecture.ARMV6 ]; architectures = [ Architecture.ARMV6 ];

6
lime/tools/platforms/MacPlatform.hx
View File

@@ -238,12 +238,6 @@ class MacPlatform extends PlatformTarget {
commands.push ([ "-Dmac", "-DHXCPP_M32" ]); commands.push ([ "-Dmac", "-DHXCPP_M32" ]);
} }
if (targetFlags.exists("tvos")) {
commands.push ([ "-Dtvos", "-Dtoolchain=appletvos", "-DBINDIR=AppleTV" ]);
}
CPPHelper.rebuild (project, commands); CPPHelper.rebuild (project, commands);

9
templates/haxe/DefaultAssetLibrary.hx
View File

@@ -315,15 +315,14 @@ class DefaultAssetLibrary extends AssetLibrary {
#else #else
if (className.exists (id)) { if (className.exists (id)) {
var fontClass = className.get (id); var fontClass = className.get (id);
return cast (Type.createInstance (fontClass, []), Image); return cast (Type.createInstance (fontClass, []), Image);
} else { } else {
#if tvos
return Image.fromFile ("assets/" + path.get (id));
#else
return Image.fromFile (path.get (id)); return Image.fromFile (path.get (id));
#end
} }
#end #end
@@ -712,7 +711,7 @@ class DefaultAssetLibrary extends AssetLibrary {
if (!className.exists (asset.id)) { if (!className.exists (asset.id)) {
#if ios || tvos #if (ios || tvos)
path.set (asset.id, "assets/" + asset.path); path.set (asset.id, "assets/" + asset.path);
#else #else
path.set (asset.id, asset.path); path.set (asset.id, asset.path);

8
tools/CommandLineTools.hx
View File

@@ -240,12 +240,12 @@ class CommandLineTools {
case "appletv", "appletvos": case "appletv", "appletvos":
target = Platform.TVOS; target = Platform.TVOS;
case "appletvsim": case "appletvsim":
target = Platform.TVOS; target = Platform.TVOS;
targetFlags.set ("simulator", ""); targetFlags.set ("simulator", "");
default: default:
target = cast targetName.toLowerCase (); target = cast targetName.toLowerCase ();
@@ -594,7 +594,7 @@ class CommandLineTools {
case TVOS: case TVOS:
platform = new TVOSPlatform (command, project, targetFlags); platform = new TVOSPlatform (command, project, targetFlags);
default: default:
} }
@@ -759,7 +759,7 @@ class CommandLineTools {
LogHelper.println (" \x1b[1mlinux\x1b[0m -- Create a Linux application"); LogHelper.println (" \x1b[1mlinux\x1b[0m -- Create a Linux application");
LogHelper.println (" \x1b[1mmac\x1b[0m -- Create a Mac OS X application"); LogHelper.println (" \x1b[1mmac\x1b[0m -- Create a Mac OS X application");
LogHelper.println (" \x1b[1mtizen\x1b[0m -- Create a Tizen application"); LogHelper.println (" \x1b[1mtizen\x1b[0m -- Create a Tizen application");
LogHelper.println (" \x1b[1mtvos\x1b[0m -- Create an AppleTVOS application"); LogHelper.println (" \x1b[1mtvos\x1b[0m -- Create a tvOS application");
LogHelper.println (" \x1b[1mwebos\x1b[0m -- Create a webOS application"); LogHelper.println (" \x1b[1mwebos\x1b[0m -- Create a webOS application");
LogHelper.println (" \x1b[1mwindows\x1b[0m -- Create a Windows application"); LogHelper.println (" \x1b[1mwindows\x1b[0m -- Create a Windows application");
LogHelper.println (""); LogHelper.println ("");