"

git-svn-id: https://codelite.svn.sourceforge.net/svnroot/codelite/trunk@1047 9da81c78-c036-0410-9e1f-a2b0375e4b5a
eranif · Feb 1, 2008 · 14c4b80 · 14c4b80
1 parent 78a02d6
commit 14c4b80
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/MakefileParser/MakefileImporter.project b/MakefileParser/MakefileImporter.project
@@ -29,7 +29,7 @@
   <Settings Type="Executable">
     <Configuration Name="DebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger">
       <General OutputFile="./MakefileImporter" IntermediateDirectory="./DebugUnicode" Command="./MakefileImporter" CommandArguments="" WorkingDirectory="./"/>
-      <Compiler Required="yes" Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes)">
+      <Compiler Required="yes" Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes);-Wall">
         <IncludePath Value="."/>
         <IncludePath Value="../../trunk/Interfaces"/>
         <IncludePath Value="../../trunk/CodeLite"/>
@@ -53,11 +53,11 @@
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand/>
-        <BuildCommand/>
+        <CleanCommand></CleanCommand>
+        <BuildCommand></BuildCommand>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild/>
+        <CustomPostBuild></CustomPostBuild>
         <CustomPreBuild>makefile_parser.cpp makefile_lexer.cpp
 makefile_parser.cpp: makefile_parser.y
 	yacc -dl  -t -v makefile_parser.y
@@ -96,12 +96,12 @@ makefile_lexer.cpp: makefile_parser.l
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand/>
-        <BuildCommand/>
+        <CleanCommand></CleanCommand>
+        <BuildCommand></BuildCommand>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
+        <CustomPostBuild></CustomPostBuild>
+        <CustomPreBuild></CustomPreBuild>
       </AdditionalRules>
     </Configuration>
     <Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger">
@@ -133,11 +133,11 @@ makefile_lexer.cpp: makefile_parser.l
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand/>
-        <BuildCommand/>
+        <CleanCommand></CleanCommand>
+        <BuildCommand></BuildCommand>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild/>
+        <CustomPostBuild></CustomPostBuild>
         <CustomPreBuild>makefile_parser.cpp makefile_lexer.cpp
 makefile_parser.cpp: makefile_parser.y
 	yacc -dl  -t -v makefile_parser.y
@@ -178,12 +178,12 @@ makefile_lexer.cpp: makefile_parser.l
       <PreBuild/>
       <PostBuild/>
       <CustomBuild Enabled="no">
-        <CleanCommand/>
-        <BuildCommand/>
+        <CleanCommand></CleanCommand>
+        <BuildCommand></BuildCommand>
       </CustomBuild>
       <AdditionalRules>
-        <CustomPostBuild/>
-        <CustomPreBuild/>
+        <CustomPostBuild></CustomPostBuild>
+        <CustomPreBuild></CustomPreBuild>
       </AdditionalRules>
     </Configuration>
   </Settings>

diff --git a/MakefileParser/VariableLexer.cpp b/MakefileParser/VariableLexer.cpp
@@ -7,11 +7,11 @@
 #include <wx/log.h>
 #include <wx/string.h>
 
-void initLexer(const char *filename);
+extern void initLexer(const char *filename);
 
 #define YYSTYPE std::string
 
-YYSTYPE yyparse();
+extern int yyparse();
 
 typedef std::vector<std::string> Strings;
 typedef Strings::iterator IStrings;

diff --git a/MakefileParser/main.cpp b/MakefileParser/main.cpp
@@ -7,6 +7,9 @@
 typedef std::map<wxString, wxString> Tokens;
 typedef Tokens::iterator ITokens;
 
+extern void initLexer(const char *filename);
+extern int yyparse();
+
 char *loadFile(const char *fileName)
 {
 	FILE *fp;
@@ -52,7 +55,7 @@ int main(int argv, char* argc[])
 
 	//release the input data
 	free(data);
-
+	/*
 	wxArrayString result = lexer.getResult();
 	wxArrayString unmatched = lexer.getUnmatched();
 	wxArrayString error = lexer.getError();
@@ -84,6 +87,6 @@ int main(int argv, char* argc[])
         }
 
 	fprintf(of, "=============== DONE =============\n");
-	fclose(of);
+	fclose(of);*/
 	return 0;
 }