X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=f10e21e5aeee4f3a24c78cfbca194b897c13b16d;hb=2606b03da59dc10e3826b833a2fceb0831d79972;hp=d891439377c9d0ba440a4e8568a981d5af82deb4;hpb=bb5c048950a011f181cb3235ed2b0b2677869171;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index d891439..f10e21e 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef BUILDINFO_H_
 #define BUILDINFO_H_
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "misc.h"
 
 /**
@@ -20,32 +13,45 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<BuildInfo>
 	{
 	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); }
+		void incpath(const std::string &);
+		void define(const std::string &, const std::string &);
+		void libpath(const std::string &);
+		void library(const std::string &);
+		void warning(const std::string &);
 	};
 	
-	StringList cflags;
-	StringList defines;
+	enum UpdateLevel
+	{
+		LOCAL,
+		DEPENDENCY,
+		CHAINED
+	};
+
+	typedef std::map<std::string, std::string> DefineMap;
+
+	DefineMap defines;
 	StringList incpath;
-	StringList ldflags;
 	StringList libpath;
 	StringList libs;
+	StringList warnings;
+	bool threads;
+	bool debug;
+	int optimize;
+	bool strip;
+
+	BuildInfo();
+
+	/** Adds another BuildInfo to the end of this one. */
+	void update_from(const BuildInfo &, UpdateLevel = LOCAL);
 
-	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