Use Path objects to store include and library paths

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index c7c89ac649e5a6089c0e8adf95b163f6d3e691c8..144a16dabb0e1e3215290745566b827bb63b220e 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -18,10 +18,8 @@ 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 &);
@@ -29,22 +27,34 @@ public:
        
        enum UpdateLevel
        {
-               LOCAL,
-               DEPENDENCY,
-               CHAINED
+               LOCAL,       //< Include all information
+               DEPENDENCY,  //< Include all but code generation options
+               CHAINED      //< Include only compilation options
        };
 
-       StringList cflags;
-       StringList defines;
-       StringList incpath;
-       StringList ldflags;
-       StringList libpath;
-       StringList libs;
-       StringList warnings;
+       typedef std::map<std::string, std::string> DefineMap;
+       typedef std::list<Msp::FS::Path> PathList;
+       typedef std::list<std::string> WordList;
 
-       /** Adds another BuildInfo to the end of this one. */
+       DefineMap defines;
+       PathList incpath;
+       PathList libpath;
+       WordList libs;
+       WordList warnings;
+       bool threads;
+       bool debug;
+       int optimize;
+       bool strip;
+
+       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();