Generate export definitions with dlltool

[builder.git] / source / buildinfo.h

diff --git a/source/buildinfo.h b/source/buildinfo.h
index 8bedcec4c7506d4a0209b92ef33f269948679ac0..595fe1a55ccd5bb414ebbe5febec8f86431465b2 100644 (file)
--- a/source/buildinfo.h
+++ b/source/buildinfo.h
@@ -4,7 +4,7 @@
 #include <list>
 #include <string>
 #include <msp/datafile/objectloader.h>
-#include "misc.h"
+#include <msp/fs/path.h>
 
 /**
 Stores information about compiler command line parameters in a more abstract
@@ -39,6 +39,32 @@ public:
                CHAINED      //< Include only compilation options
        };
 
+       /**
+       A wrapper which tracks the set status of the wrapped variable.  A default
+       value may be provided in initialization without causing it to be treated as
+       set.  Assigning from a raw value flags the Tracked object as set.  Assigning
+       from another Tracked object will only change the value of the target if the
+       source is set.  
+       */
+       template<typename T>
+       class Tracked
+       {
+       public:
+               typedef T LoadType;
+
+       private:
+               T value;
+               bool set;
+
+       public:
+               Tracked(): value(T()), set(false) { }
+               Tracked(T v): value(v), set(false) { }
+               Tracked &operator=(const Tracked &v) { if(v.set) { value = v.value; set = true; } return *this; }
+
+               Tracked &operator=(T v) { value = v; set = true; return *this; }
+               operator T() const { return value; }
+       };
+
        typedef std::map<std::string, std::string> DefineMap;
        typedef std::list<Msp::FS::Path> PathList;
        typedef std::list<std::string> WordList;
@@ -47,13 +73,13 @@ public:
        PathList incpath;
        PathList libpath;
        WordList libs;
-       LibraryMode libmode;
-       bool threads;
-       bool debug;
-       int optimize;
-       bool strip;
-       unsigned warning_level;
-       bool fatal_warnings;
+       Tracked<LibraryMode> libmode;
+       Tracked<bool> threads;
+       Tracked<bool> debug;
+       Tracked<int> optimize;
+       Tracked<bool> strip;
+       Tracked<unsigned> warning_level;
+       Tracked<bool> fatal_warnings;
 
        BuildInfo();
 
@@ -62,11 +88,6 @@ 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();
 };
 
 #endif