diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-18 07:22:26 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-18 07:22:26 +0000 |
| commit | 24d6ec0750afd0c393bab09aabe174da824a8c56 (patch) | |
| tree | c856ef924b12b5f1a88809208c38438cc874e6a1 /tools/mhmake/src/util.h | |
| parent | 5a30da03ddafd49caf68942f7ddf021bd898ef6d (diff) | |
| download | vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.tar.gz vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.tar.bz2 vcxsrv-24d6ec0750afd0c393bab09aabe174da824a8c56.zip | |
svn merge --reintegrate ^/branches/mhmake.parallel .
Diffstat (limited to 'tools/mhmake/src/util.h')
| -rw-r--r-- | tools/mhmake/src/util.h | 6 |
1 files changed, 2 insertions, 4 deletions
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()
|