Evaluate conditions at load time to allow more flexibility

[builder.git] / source / config.h

diff --git a/source/config.h b/source/config.h
index f18487bfeeb61493bc5ab0459f81903deff13ddf..64e42259defb93454237f316a817155218ea31d7 100644 (file)
--- a/source/config.h
+++ b/source/config.h
@@ -29,6 +29,7 @@ public:
        };
 
        typedef std::map<std::string, Option> OptionMap;
+       typedef std::map<std::string, std::string> InputOptions;
 
 private:
        class Loader: public Msp::DataFile::ObjectLoader<Config>
@@ -41,6 +42,7 @@ private:
 
        SourcePackage &package;
        OptionMap options;
+       InputOptions pending_options;
        Msp::Time::TimeStamp mtime;
        bool changed;
 
@@ -69,9 +71,7 @@ public:
        void finish();
 
        void save() const;
-private:
        bool set_option(const std::string &, const std::string &);
-public:
        void load();
 };