From 77cc7992531840a9110f7b7dab0eb9be763b9c2f Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Fri, 2 Oct 2015 09:54:53 -0700
Subject: [PATCH] Minor tweak

---
 lime/project/HXProject.hx             | 2 ++
 lime/tools/platforms/MacPlatform.hx   | 6 ------
 templates/haxe/DefaultAssetLibrary.hx | 9 ++++-----
 tools/CommandLineTools.hx             | 8 ++++----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/lime/project/HXProject.hx b/lime/project/HXProject.hx
index fe54b1afb..44c8f6d18 100644
--- a/lime/project/HXProject.hx
+++ b/lime/project/HXProject.hx
@@ -159,7 +159,9 @@ class HXProject {
 					}
 					
 				} else if (target == Platform.TVOS) {
+					
 					architectures = [ Architecture.ARM64 ];
+					
 				} else {
 					
 					architectures = [ Architecture.ARMV6 ];
diff --git a/lime/tools/platforms/MacPlatform.hx b/lime/tools/platforms/MacPlatform.hx
index 171a94a6e..6efd5b212 100644
--- a/lime/tools/platforms/MacPlatform.hx
+++ b/lime/tools/platforms/MacPlatform.hx
@@ -238,12 +238,6 @@ class MacPlatform extends PlatformTarget {
 			commands.push ([ "-Dmac", "-DHXCPP_M32" ]);
 			
 		}
-
-		if (targetFlags.exists("tvos")) {
-
-			commands.push ([ "-Dtvos", "-Dtoolchain=appletvos", "-DBINDIR=AppleTV" ]);
-
-		}
 		
 		CPPHelper.rebuild (project, commands);
 		
diff --git a/templates/haxe/DefaultAssetLibrary.hx b/templates/haxe/DefaultAssetLibrary.hx
index 579571601..b3e37c50b 100644
--- a/templates/haxe/DefaultAssetLibrary.hx
+++ b/templates/haxe/DefaultAssetLibrary.hx
@@ -315,15 +315,14 @@ class DefaultAssetLibrary extends AssetLibrary {
 		#else
 		
 		if (className.exists (id)) {
+			
 			var fontClass = className.get (id);
 			return cast (Type.createInstance (fontClass, []), Image);
 			
 		} else {
-			#if tvos
-			return Image.fromFile ("assets/" + path.get (id));
-			#else
+			
 			return Image.fromFile (path.get (id));
-			#end
+			
 		}
 		
 		#end
@@ -712,7 +711,7 @@ class DefaultAssetLibrary extends AssetLibrary {
 							
 							if (!className.exists (asset.id)) {
 								
-								#if ios || tvos
+								#if (ios || tvos)
 								path.set (asset.id, "assets/" + asset.path);
 								#else
 								path.set (asset.id, asset.path);
diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index 6d34e3815..76edabed3 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -240,12 +240,12 @@ class CommandLineTools {
 						case "appletv", "appletvos":
 							
 							target = Platform.TVOS;
-							
+						
 						case "appletvsim":
 							
 							target = Platform.TVOS;
 							targetFlags.set ("simulator", "");
-
+						
 						default:
 							
 							target = cast targetName.toLowerCase ();
@@ -594,7 +594,7 @@ class CommandLineTools {
 				case TVOS:
 					
 					platform = new TVOSPlatform (command, project, targetFlags);
-
+				
 				default:
 				
 			}
@@ -759,7 +759,7 @@ class CommandLineTools {
 		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[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[1mwindows\x1b[0m -- Create a Windows application");
 		LogHelper.println ("");