From 2263fe2807b11f561658917940a3880b25523445 Mon Sep 17 00:00:00 2001
From: Steven <steven@rocketgames.com>
Date: Fri, 8 Apr 2016 10:13:09 -0700
Subject: [PATCH] Fixing template ordering in hxp files

---
 lime/project/HXProject.hx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lime/project/HXProject.hx b/lime/project/HXProject.hx
index e944fc3b8..9e6511cf9 100644
--- a/lime/project/HXProject.hx
+++ b/lime/project/HXProject.hx
@@ -445,6 +445,7 @@ class HXProject {
 		ProcessHelper.runCommand ("", "haxe", [ name, "-main", "lime.project.HXProject", "-cp", tempDirectory, "-neko", nekoOutput, "-cp", PathHelper.combine (PathHelper.getHaxelib (new Haxelib ("lime")), "tools"), "-lib", "lime", "-D", "lime-curl", "-D", "native", "-D", "lime-native", "-D", "lime-cffi" ]);
 		ProcessHelper.runCommand ("", "neko", [ FileSystem.fullPath (nekoOutput), HXProject._command, name, Std.string (HXProject._target), Std.string (HXProject._debug), Serializer.run (HXProject._targetFlags), Serializer.run (HXProject._templatePaths), Serializer.run (HXProject._userDefines), temporaryFile ]);
 		
+		var tPaths:Array<String> = [];
 		try {
 			
 			var outputPath = PathHelper.combine (tempDirectory, "output.dat");
@@ -456,6 +457,10 @@ class HXProject {
 				unserializer.setResolver (cast { resolveEnum: Type.resolveEnum, resolveClass: resolveClass });
 				project = unserializer.unserialize ();
 				
+				//Because the project file template paths need to take priority,
+				//Add them after loading template paths from haxelibs below
+				tPaths = project.templatePaths; 
+				project.templatePaths = [];
 			}
 			
 		} catch (e:Dynamic) {}
@@ -468,7 +473,9 @@ class HXProject {
 			StringMapHelper.copyKeys (project.defines, defines);
 			
 			processHaxelibs (project, defines);
-			
+		
+			//Adding template paths from the Project file
+			project.templatePaths = ArrayHelper.concatUnique (project.templatePaths, tPaths, true);	
 		}
 		
 		return project;