X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=9805e0a2ec0aa5d1c6f140d775e1c68019758225;hb=3b13563d75a8fd711a9cf87cae62960f90a5bc39;hp=10fd3bec439c3ad6a16379e6453d1e877325f0d1;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 10fd3be..9805e0a 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,7 +3,7 @@
 
 #include <list>
 #include <string>
-#include <msp/parser/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "misc.h"
 
 /**
@@ -13,32 +13,60 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-	class Loader: public Msp::Parser::Loader
+	enum LibraryMode
+	{
+		FORCE_STATIC,  //< Only accept static libraries
+		STATIC,        //< Prefer static libraries but accept dynamic as well
+		DYNAMIC,       //< Prefer dynamic libraries but accept static as well
+		FORCE_DYNAMIC  //< Only accept dynamic libraries
+	};
+
+	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;
-	StringList incpath;
-	StringList ldflags;
-	StringList libpath;
-	StringList libs;
-
-	void add(const BuildInfo &);
-	void unique();
+	enum UpdateLevel
+	{
+		LOCAL,       //< Include all information
+		DEPENDENCY,  //< Include all but code generation options
+		CHAINED      //< Include only compilation options
+	};
+
+	typedef std::map<std::string, std::string> DefineMap;
+	typedef std::list<Msp::FS::Path> PathList;
+	typedef std::list<std::string> WordList;
+
+	DefineMap defines;
+	PathList incpath;
+	PathList libpath;
+	WordList libs;
+	LibraryMode libmode;
+	WordList warnings;
+	bool threads;
+	bool debug;
+	int optimize;
+	bool strip;
+
+	BuildInfo();
+
+	/** Updates the BuildInfo from another one.  Lists are concatenated, with
+	the first occurrence of each item preserved.  Scalars are overwritten.
+	
+	The update level determines what information is updated. */
+	void update_from(const BuildInfo &, UpdateLevel = LOCAL);
+
 private:
-	void unique(StringList &);
+	/** 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();
 };
 
 #endif