X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=595fe1a55ccd5bb414ebbe5febec8f86431465b2;hb=b58e16b078df97d8aabf64a8e4d0d8ce37ad3877;hp=144a16dabb0e1e3215290745566b827bb63b220e;hpb=ca18323d45d67243773b03668e79c715aa976441;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 144a16d..595fe1a 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -4,7 +4,7 @@
 #include <list>
 #include <string>
 #include <msp/datafile/objectloader.h>
-#include "misc.h"
+#include <msp/fs/path.h>
 
 /**
 Stores information about compiler command line parameters in a more abstract
@@ -13,6 +13,14 @@ form.  Allows combining with other BuildInfos to support package dependencies.
 class BuildInfo
 {
 public:
+	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:
@@ -22,7 +30,6 @@ public:
 		void define(const std::string &, const std::string &);
 		void libpath(const std::string &);
 		void library(const std::string &);
-		void warning(const std::string &);
 	};
 	
 	enum UpdateLevel
@@ -32,6 +39,32 @@ public:
 		CHAINED      //< Include only compilation options
 	};
 
+	/**
+	A wrapper which tracks the set status of the wrapped variable.  A default
+	value may be provided in initialization without causing it to be treated as
+	set.  Assigning from a raw value flags the Tracked object as set.  Assigning
+	from another Tracked object will only change the value of the target if the
+	source is set.  
+	*/
+	template<typename T>
+	class Tracked
+	{
+	public:
+		typedef T LoadType;
+
+	private:
+		T value;
+		bool set;
+
+	public:
+		Tracked(): value(T()), set(false) { }
+		Tracked(T v): value(v), set(false) { }
+		Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; }
+
+		Tracked &operator=(T v) { value = v; set = true; return *this; }
+		operator T() const { return value; }
+	};
+
 	typedef std::map<std::string, std::string> DefineMap;
 	typedef std::list<Msp::FS::Path> PathList;
 	typedef std::list<std::string> WordList;
@@ -40,11 +73,13 @@ public:
 	PathList incpath;
 	PathList libpath;
 	WordList libs;
-	WordList warnings;
-	bool threads;
-	bool debug;
-	int optimize;
-	bool strip;
+	Tracked<LibraryMode> libmode;
+	Tracked<bool> threads;
+	Tracked<bool> debug;
+	Tracked<int> optimize;
+	Tracked<bool> strip;
+	Tracked<unsigned> warning_level;
+	Tracked<bool> fatal_warnings;
 
 	BuildInfo();
 
@@ -53,11 +88,6 @@ public:
 	
 	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();
 };
 
 #endif