X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=10fd3bec439c3ad6a16379e6453d1e877325f0d1;hb=40eb101a642b9ed2e898eec39e0916fa71066b23;hp=02549ea3a00628a781319700b26a8fcd9b38463d;hpb=4dc31cca056ea293d320928f61fef0558089d32d;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 02549ea..10fd3be 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,21 +3,42 @@
 
 #include <list>
 #include <string>
+#include <msp/parser/loader.h>
+#include "misc.h"
 
+/**
+Stores information about compiler command line parameters in a more abstract
+form.  Allows combining with other BuildInfos to support package dependencies.
+*/
 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