Generate export definitions with dlltool

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index ec8156798d70628d0597e6936ecd39622d9fff58..c02d115fd1b252e409191834a9ca45730efeaaf1 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -1,4 +1,6 @@
 #include <algorithm>
+#include <set>
+#include <msp/strings/format.h>
 #include "buildinfo.h"
 
 using namespace std;
@@ -7,27 +9,31 @@ using namespace Msp;
 namespace {
 
 /** Removes any duplicate entries from a list, leaving only the first one.  The
-order of other elements is preserved.  O(n²) efficiency. */
-void unique(StringList &l)
+order of other elements is preserved.  O(nlogn) efficiency. */
+template<typename T>
+void unique(list<T> &l)
 {
-       for(StringList::iterator i=l.begin(); i!=l.end(); ++i)
-               for(StringList::iterator j=i; j!=l.end();)
-               {
-                       if(j!=i && *j==*i)
-                               j = l.erase(j);
-                       else
-                               ++j;
-               }
+       set<T> seen;
+       for(typename list<T>::iterator i=l.begin(); i!=l.end(); )
+       {
+               if(seen.count(*i))
+                       l.erase(i++);
+               else
+                       seen.insert(*i++);
+       }
 }
 
 }
 
 
 BuildInfo::BuildInfo():
+       libmode(DYNAMIC),
        threads(false),
        debug(false),
        optimize(0),
-       strip(false)
+       strip(false),
+       warning_level(0),
+       fatal_warnings(false)
 { }
 
 void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
@@ -40,44 +46,20 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
                libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
                libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
        }
-       warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
        threads = bi.threads;
        if(level==LOCAL)
        {
+               libmode = bi.libmode;
                debug = bi.debug;
                optimize = bi.optimize;
                strip = bi.strip;
+               warning_level = bi.warning_level;
+               fatal_warnings = bi.fatal_warnings;
        }
 
-       unique();
-}
-
-void BuildInfo::unique()
-{
-       ::unique(incpath);
-       ::unique(libpath);
-       ::unique(libs);
-
-       for(StringList::iterator i=warnings.begin(); i!=warnings.end(); ++i)
-       {
-               bool flag = i->compare(0, 3, "no-");
-
-               string warn = (flag ? *i : i->substr(3));
-               string no_warn = "no-"+warn;
-
-               for(StringList::iterator j=i; j!=warnings.end();)
-               {
-                       if(j!=i && (*j==warn || *j==no_warn))
-                       {
-                               flag = (*j==warn);
-                               j = warnings.erase(j);
-                       }
-                       else
-                               ++j;
-               }
-
-               *i = (flag ? warn : no_warn);
-       }
+       unique(incpath);
+       unique(libpath);
+       unique(libs);
 }
 
 
@@ -89,33 +71,45 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        add("incpath",  &Loader::incpath);
        add("libpath",  &Loader::libpath);
        add("library",  &Loader::library);
+       add("libmode",  &BuildInfo::libmode);
        add("optimize", &BuildInfo::optimize);
        add("strip",    &BuildInfo::strip);
        add("threads",  &BuildInfo::threads);
-       add("warning",  &Loader::warning);
+       add("warning_level", &BuildInfo::warning_level);
+       add("fatal_warnings", &BuildInfo::fatal_warnings);
 }
 
-void BuildInfo::Loader::incpath(const std::string &s)
+void BuildInfo::Loader::incpath(const string &s)
 {
        obj.incpath.push_back(s);
 }
 
-void BuildInfo::Loader::define(const std::string &d, const std::string &v)
+void BuildInfo::Loader::define(const string &d, const string &v)
 {
        obj.defines[d] = v;
 }
 
-void BuildInfo::Loader::libpath(const std::string &s)
+void BuildInfo::Loader::libpath(const string &s)
 {
        obj.libpath.push_back(s);
 }
 
-void BuildInfo::Loader::library(const std::string &s)
+void BuildInfo::Loader::library(const string &s)
 {
        obj.libs.push_back(s);
 }
 
-void BuildInfo::Loader::warning(const std::string &s)
+
+void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {
-       obj.warnings.push_back(s);
+       if(conv.get()=="FORCE_STATIC")
+               libmode = BuildInfo::FORCE_STATIC;
+       else if(conv.get()=="STATIC")
+               libmode = BuildInfo::STATIC;
+       else if(conv.get()=="DYNAMIC")
+               libmode = BuildInfo::DYNAMIC;
+       else if(conv.get()=="FORCE_DYNAMIC")
+               libmode = BuildInfo::FORCE_DYNAMIC;
+       else
+               throw lexical_error(format("Conversion of '%s' to LibraryMode", conv.get()));
 }