From 24d6ec0750afd0c393bab09aabe174da824a8c56 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 18 Feb 2010 07:22:26 +0000
Subject: svn merge --reintegrate ^/branches/mhmake.parallel .

---
 tools/mhmake/src/util.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'tools/mhmake/src/util.h')

diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h
index 4c5528452..457823abb 100644
--- a/tools/mhmake/src/util.h
+++ b/tools/mhmake/src/util.h
@@ -50,9 +50,7 @@
 #define PLATFORM     "linux"
 #endif
 
-#define MHMAKEVER    "1.4.13"
-
-string SearchCommand(const string &Command, const string &Extension="");
+#define MHMAKEVER    "2.0.0_rc"
 
 class makecommand
 {
@@ -173,7 +171,7 @@ struct loadedmakefile : public refbase
   vector<string>       m_CommandLineTargets;
   refptr<mhmakeparser> m_pParser;
 
-  loadedmakefile(vector<string> &Args,const string &Makefile=g_EmptyString);
+  loadedmakefile(const refptr<fileinfo> &pDir, vector<string> &Args,const string &Makefile=g_EmptyString);
 
   void LoadMakefile();
   void AddCommandLineVarsToEnvironment()
-- 
cgit v1.2.3