From 0189515275193203bb5e3bebaf185767c9f5e62c Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 1 Sep 2010 15:45:01 +0000 Subject: Solved linux problems --- tools/mhmake/src/mhmakefileparser.h | 2 +- tools/mhmake/src/mhmakelexer.l | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/mhmake') diff --git a/tools/mhmake/src/mhmakefileparser.h b/tools/mhmake/src/mhmakefileparser.h index 73d3979dc..1efb37c39 100644 --- a/tools/mhmake/src/mhmakefileparser.h +++ b/tools/mhmake/src/mhmakefileparser.h @@ -104,7 +104,7 @@ protected: static mh_time_t m_sBuildTime; private: - string mhmakefileparser::ResolveExpression(const string &InExpr,string &Rest) const; + string ResolveExpression(const string &InExpr,string &Rest) const; public: #ifdef _DEBUG diff --git a/tools/mhmake/src/mhmakelexer.l b/tools/mhmake/src/mhmakelexer.l index 59aaad0ca..8796e70c4 100644 --- a/tools/mhmake/src/mhmakelexer.l +++ b/tools/mhmake/src/mhmakelexer.l @@ -447,6 +447,11 @@ load_makefile { [ \t\r]*[a-zA-Z0-9_]+[ \t\r]*\n { unput( '\n' ); m_IndentStack.push(0); +#ifndef WIN32 + int lastidx=strlen((const char *)yytext)-1; + if (yytext[lastidx]=='\r') + yytext[lastidx]='\0'; +#endif string Val=GetParser()->ExpandVar((const char *)yytext); if (Val.empty() || Val=="0") { -- cgit v1.2.3