X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=ca8819d59e55ec234fbfeb5a67aa2c5bfdf58ee6;hb=6ed04f66e56958890c2ecca82fa3885f10f8adf0;hp=297efff1df0c915ee4d51a31d831d0051ed58293;hpb=50be4619cca4bb44e5abf8759720c255ef6d3b45;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 297efff..ca8819d 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,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
@@ -33,16 +40,20 @@ public:
 	};
 
 	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();
 
@@ -51,11 +62,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