X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuildinfo.h;h=a967bbd7535aa7b83256856092fb867c2ab1fd6f;hb=0458300fda4f345f865a7f3ee4fc0f2020a91983;hp=fbd186c617d1af03a239a30e262175dbf79625fa;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index fbd186c..a967bbd 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -10,7 +10,7 @@ Distributed under the LGPL
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/loader.h>
 #include "misc.h"
 
 /**
@@ -20,19 +20,21 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	class Loader: public Msp::DataFile::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); }
+	public:
+		Loader(BuildInfo &);
+	private:
+		void cflag(const std::string &);
+		void incpath(const std::string &);
+		void define(const std::string &);
+		void ldflag(const std::string &);
+		void libpath(const std::string &);
+		void library(const std::string &);
+		void warning(const std::string &);
 	};
 	
 	StringList cflags;
@@ -41,11 +43,14 @@ public:
 	StringList ldflags;
 	StringList libpath;
 	StringList libs;
+	StringList warnings;
 
+	/** Adds another BuildInfo to the end of this one. */
 	void add(const BuildInfo &);
+
+	/** Makes sure there are no duplicate entries in the lists.  For warnings,
+	contradicting flags are eliminated and the last one stays in effect. */
 	void unique();
-private:
-	void unique(StringList &);
 };
 
 #endif