X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=8bedcec4c7506d4a0209b92ef33f269948679ac0;hb=d861af0938a9043270245f6973d4ddbdc94e75b4;hp=f10e21e5aeee4f3a24c78cfbca194b897c13b16d;hpb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index f10e21e..8bedcec 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -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,33 +30,40 @@ 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
 	{
-		LOCAL,
-		DEPENDENCY,
-		CHAINED
+		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;
-	StringList incpath;
-	StringList libpath;
-	StringList libs;
-	StringList warnings;
+	PathList incpath;
+	PathList libpath;
+	WordList libs;
+	LibraryMode libmode;
 	bool threads;
 	bool debug;
 	int optimize;
 	bool strip;
+	unsigned warning_level;
+	bool fatal_warnings;
 
 	BuildInfo();
 
-	/** Adds another BuildInfo to the end of this one. */
+	/** 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();