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 18f33a093676a2d98c54b4a3c2c9a338d8c10df7..144a16dabb0e1e3215290745566b827bb63b220e 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -33,12 +33,14 @@ 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;
+       WordList warnings;
        bool threads;
        bool debug;
        int optimize;
@@ -52,6 +54,7 @@ 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();