X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.h;h=f10e21e5aeee4f3a24c78cfbca194b897c13b16d;hb=9ab7e80ccd0a8043609d6a09f4119fa6e1d4ad9c;hp=0d7b64aeae4e8e82be35bfe9117cf26f7cd3c2e0;hpb=0bf7d92472d829d21fc5901060cab4e032170a4b;p=builder.git

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 0d7b64a..f10e21e 100644
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -18,25 +18,36 @@ public:
 	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;
+	enum UpdateLevel
+	{
+		LOCAL,
+		DEPENDENCY,
+		CHAINED
+	};
+
+	typedef std::map<std::string, std::string> DefineMap;
+
+	DefineMap defines;
 	StringList incpath;
-	StringList ldflags;
 	StringList libpath;
 	StringList libs;
 	StringList warnings;
+	bool threads;
+	bool debug;
+	int optimize;
+	bool strip;
+
+	BuildInfo();
 
 	/** Adds another BuildInfo to the end of this one. */
-	void update_from(const BuildInfo &);
+	void update_from(const BuildInfo &, UpdateLevel = LOCAL);
 
 	/** Makes sure there are no duplicate entries in the lists.  For warnings,
 	contradicting flags are eliminated and the last one stays in effect. */