Code reorganizing and cleanup

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 02549ea3a00628a781319700b26a8fcd9b38463d..ccd4b86798db7cc4a8c96eafffaef56c0ea82f82 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,21 +3,38 @@
 
 #include <list>
 #include <string>
+#include <msp/parser/loader.h>
+#include "misc.h"
 
 class BuildInfo
 {
 public:
-       typedef std::list<std::string> InfoList;
+       class Loader: public Msp::Parser::Loader
+       {
+       public:
+               Loader(BuildInfo &);
+       private:
+               BuildInfo &binfo;
+               
+               void cflag(const std::string &s)   { binfo.cflags.push_back(s); }
+               void incpath(const std::string &s) { binfo.incpath.push_back(s); }
+               void define(const std::string &s)  { binfo.defines.push_back(s); }
+               void ldflag(const std::string &s)  { binfo.ldflags.push_back(s); }
+               void libpath(const std::string &s) { binfo.libpath.push_back(s); }
+               void library(const std::string &s) { binfo.libs.push_back(s); }
+       };
        
-       InfoList cflags;
-       InfoList defines;
-       InfoList incpath;
-       InfoList ldflags;
-       InfoList libpath;
-       InfoList libs;
+       StringList cflags;
+       StringList defines;
+       StringList incpath;
+       StringList ldflags;
+       StringList libpath;
+       StringList libs;
 
        void add(const BuildInfo &);
        void unique();
+private:
+       void unique(StringList &);
 };
 
 #endif