Target::prepare shouldn't be virtual

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index f10e21e5aeee4f3a24c78cfbca194b897c13b16d..9805e0a2ec0aa5d1c6f140d775e1c68019758225 100644 (file)
--- 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:
@@ -27,18 +35,21 @@ public:
        
        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;
+       WordList warnings;
        bool threads;
        bool debug;
        int optimize;
@@ -46,9 +57,13 @@ public:
 
        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();