From d74d9f4e60e48260ff1fad3ff00aaf000f111a66 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 22 Oct 2010 14:00:01 +0000 Subject: Increased gnu make compatibility Optimised --- tools/mhmake/src/util.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tools/mhmake/src/util.h') diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h index 9b49cf489..ff1fac9aa 100644 --- a/tools/mhmake/src/util.h +++ b/tools/mhmake/src/util.h @@ -1,6 +1,6 @@ /* This file is part of mhmake. * - * Copyright (C) 2001-2009 Marc Haesen + * Copyright (C) 2001-2010 marha@sourceforge.net * * Mhmake is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ #define PLATFORM "linux" #endif -#define MHMAKEVER "2.2.5" +#define MHMAKEVER "2.2.9" class makecommand { @@ -150,6 +150,7 @@ struct matchres }; bool PercentMatch(const string &String,const string &Expr,matchres *pRes=NULL,const char Char='%'); +bool PercentMatchNoCase(const string &String,const string &Expr,matchres *pRes=NULL,const char Char='%'); bool PercentMatchList(const string &String,const string &ExprList,matchres *pRes=NULL); string ReplaceWithStem(const string &String,const string &Stem); @@ -158,20 +159,20 @@ struct loadedmakefile : public refbase struct loadedmakefile_statics { map m_GlobalCommandLineVars; - refptr m_MhMakeConf; + fileinfo *m_MhMakeConf; loadedmakefile_statics(); }; static loadedmakefile_statics sm_Statics; - refptr m_Makefile; - refptr m_MakeDir; + fileinfo *m_Makefile; + const fileinfo *m_MakeDir; map m_CommandLineVars; vector m_CommandLineTargets; refptr m_pParser; - loadedmakefile(const refptr &pDir, vector &Args,const string &Makefile=g_EmptyString); + loadedmakefile(const fileinfo *pDir, vector &Args,const string &Makefile=g_EmptyString); void LoadMakefile(); void AddCommandLineVarsToEnvironment() -- cgit v1.2.3