Implement eval sort warning functions (see gnu make manual for description)

Solved errors in if and foreach implementations
Removed message and reparse function (use info and eval instead)
$n can be used to add new line
define can be used to specify multi-line macros
Solved error in argument expansion in call function

1 files changed, 7 insertions, 7 deletions

diff --git a/tools/mhmake/src/mhmake.cpp b/tools/mhmake/src/mhmake.cpp
index ce2e8f7a7..ef515b0b2 100644
--- a/tools/mhmake/src/mhmake.cpp
+++ b/tools/mhmake/src/mhmake.cpp
@@ -105,9 +105,9 @@ int __CDECL main(int argc, char* argv[])
     LOADEDMAKEFILES::iterator LoadMakIt=g_LoadedMakefiles.begin();

     while (LoadMakIt!=g_LoadedMakefiles.end())

     {

-      (*LoadMakIt)->m_pParser->BuildIncludedMakefiles();

-      (*LoadMakIt)->m_pParser->ParseBuildedIncludeFiles();

-      (*LoadMakIt)->m_pParser->CheckEnv();

+      (*LoadMakIt)->m_pMakefileParser->BuildIncludedMakefiles();

+      (*LoadMakIt)->m_pMakefileParser->ParseBuildedIncludeFiles();

+      (*LoadMakIt)->m_pMakefileParser->CheckEnv();

       LoadMakIt++;

     }

 

@@ -121,16 +121,16 @@ int __CDECL main(int argc, char* argv[])
           g_Clean=true;

         }

         fileinfo *pTarget=GetFileInfo(*It,pFirstMakefile->m_MakeDir);

-        pFirstMakefile->m_pParser->BuildTarget(pTarget);

+        pFirstMakefile->m_pMakefileParser->BuildTarget(pTarget);

         It++;

       }

     }

     else

     {

-      fileinfo *pFirstTarget=pFirstMakefile->m_pParser->GetFirstTarget();

+      fileinfo *pFirstTarget=pFirstMakefile->m_pMakefileParser->GetFirstTarget();

       if (pFirstTarget)

       {

-        pFirstMakefile->m_pParser->BuildTarget(pFirstTarget);

+        pFirstMakefile->m_pMakefileParser->BuildTarget(pFirstTarget);

       }

       else

         cout << "Warning: no targets in makefile. Nothing to be build.\nMHMAKECONF defined?\n";

@@ -139,7 +139,7 @@ int __CDECL main(int argc, char* argv[])
   }

   catch (string Message)

   {

-    cerr << "Error occured: " << Message << endl;

+    cerr << "*** Error -> " << Message << endl;

     #ifdef _DEBUG

     if (g_DumpOnError)

     {