diff options
| author | marha <marha@users.sourceforge.net> | 2010-03-16 13:03:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-03-16 13:03:59 +0000 |
| commit | ed47063ec4933a51ef0f2f7d667b8178a86b6b12 (patch) | |
| tree | 85cbcd3951bab7edd48700ed4c3fba1d40d73f11 | |
| parent | 06615d6166af0efaf2893c6b7328b96c5a86b786 (diff) | |
| download | vcxsrv-ed47063ec4933a51ef0f2f7d667b8178a86b6b12.tar.gz vcxsrv-ed47063ec4933a51ef0f2f7d667b8178a86b6b12.tar.bz2 vcxsrv-ed47063ec4933a51ef0f2f7d667b8178a86b6b12.zip | |
Solved problem with $(@:%blabla=%) when there are spaces in the filename
| -rw-r--r-- | tools/mhmake/src/mhmakefileparser.cpp | 10 | ||||
| -rw-r--r-- | tools/mhmake/src/util.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tools/mhmake/src/mhmakefileparser.cpp b/tools/mhmake/src/mhmakefileparser.cpp index e9d50a704..30916878e 100644 --- a/tools/mhmake/src/mhmakefileparser.cpp +++ b/tools/mhmake/src/mhmakefileparser.cpp @@ -252,7 +252,15 @@ string mhmakefileparser::ExpandMacro(const string &Expr) const string ToStr(pTo);
#ifdef WIN32
if (IsFileName)
- return QuoteFileName(Substitute(UnquoteFileName(ToSubst),SrcStr,ToStr));
+ {
+ matchres Res;
+ string FileName(UnquoteFileName(ToSubst));
+ if (PercentMatch(FileName,UnquoteFileName(SrcStr),&Res))
+ {
+ FileName=ReplaceWithStem(UnquoteFileName(ToStr),Res.m_Stem);
+ }
+ return QuoteFileName(FileName);
+ }
#endif
return Substitute(ToSubst,SrcStr,ToStr);
}
diff --git a/tools/mhmake/src/util.h b/tools/mhmake/src/util.h index fc39f9e84..1d3cfbb66 100644 --- a/tools/mhmake/src/util.h +++ b/tools/mhmake/src/util.h @@ -50,7 +50,7 @@ #define PLATFORM "linux"
#endif
-#define MHMAKEVER "2.0.3"
+#define MHMAKEVER "2.0.4"
class makecommand
{
|