From 2763d3a311830d49a08710da02a5caa54dfa13b9 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Sat, 30 Sep 2006 18:47:24 +0000
Subject: [PATCH] Made CxxTest work a bit more on Linux

This was SVN commit r4438.
---
 build/bin/cxxtestgen.pl         | 0
 build/premake/premake.lua       | 2 +-
 build/premake/src/Src/gnu_cpp.c | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 build/bin/cxxtestgen.pl

diff --git a/build/bin/cxxtestgen.pl b/build/bin/cxxtestgen.pl
old mode 100644
new mode 100755
diff --git a/build/premake/premake.lua b/build/premake/premake.lua
index 322f8457c2..a086469646 100755
--- a/build/premake/premake.lua
+++ b/build/premake/premake.lua
@@ -20,7 +20,7 @@ if OS == "windows" then
 	project.nasmpath = "../../build/bin/nasm.exe"
 	project.cxxtestpath = "../../build/bin/cxxtestgen.exe"
 else
-	project.cxxtestpath = "../../build/bin/cxxtestgen"
+	project.cxxtestpath = "../../build/bin/cxxtestgen.pl"
 end
 
 source_root = "../../../source/" -- default for most projects - overridden by local in others
diff --git a/build/premake/src/Src/gnu_cpp.c b/build/premake/src/Src/gnu_cpp.c
index 78bfd7c6c6..0cdd07f478 100644
--- a/build/premake/src/Src/gnu_cpp.c
+++ b/build/premake/src/Src/gnu_cpp.c
@@ -432,6 +432,7 @@ static const char* listCppTargets(const char* name)
 	}
 	else if (prj_is_kind("cxxtestgen"))
 	{
+		const char *cxxtestpath = prj_get_cxxtestpath(); // must be called before path_swapex because of shared buffer
 		const char *target_name=path_swapextension(name, ".h", ".cpp");
 		sprintf(g_buffer,
 		"%s: %s\n"
@@ -439,7 +440,7 @@ static const char* listCppTargets(const char* name)
 			"\t%s%s --part -o %s %s\n", target_name, name,
 		g_verbose?"":"\t@echo $(notdir $<)\n",
 		g_verbose?"":"@",
-		"cxxtestgen", target_name, name);
+		cxxtestpath, target_name, name);
 
 		return g_buffer;
 	}