X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=9805e0a2ec0aa5d1c6f140d775e1c68019758225;hb=5881b8499dc159564d2f69c3b037e16b4d1af4db;hp=26e56c17f01ca10232438b5e53cc0c5d2ae1c233;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 26e56c1..9805e0a 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -3,7 +3,7 @@
 
 #include <list>
 #include <string>
-#include <msp/datafile/loader.h>
+#include <msp/datafile/objectloader.h>
 #include "misc.h"
 
 /**
@@ -13,34 +13,57 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
-	class Loader: public Msp::DataFile::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>
 	{
-	private:
-		BuildInfo &binfo;
-		
 	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 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;
-	StringList warnings;
+	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;
 
-	/** Adds another BuildInfo to the end of this one. */
-	void add(const BuildInfo &);
+	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:
 	/** 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();