Support specifying library modes on a per-library basis

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index c02d115fd1b252e409191834a9ca45730efeaaf1..ad06ed89a52e0b23e56401e1c9e414040a6152d6 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -36,6 +36,14 @@ BuildInfo::BuildInfo():
        fatal_warnings(false)
 { }
 
+BuildInfo::LibraryMode BuildInfo::get_libmode_for(const string &lib) const
+{
+       LibModeMap::const_iterator i = libmodes.find(lib);
+       if(i!=libmodes.end())
+               return i->second;
+       return libmode;
+}
+
 void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
        for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
@@ -50,6 +58,8 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
        if(level==LOCAL)
        {
                libmode = bi.libmode;
+               for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
+                       libmodes[i->first] = i->second;
                debug = bi.debug;
                optimize = bi.optimize;
                strip = bi.strip;
@@ -72,6 +82,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
        add("libpath",  &Loader::libpath);
        add("library",  &Loader::library);
        add("libmode",  &BuildInfo::libmode);
+       add("libmode",  &Loader::libmode_for_lib);
        add("optimize", &BuildInfo::optimize);
        add("strip",    &BuildInfo::strip);
        add("threads",  &BuildInfo::threads);
@@ -89,6 +100,11 @@ void BuildInfo::Loader::define(const string &d, const string &v)
        obj.defines[d] = v;
 }
 
+void BuildInfo::Loader::libmode_for_lib(const string &l, LibraryMode m)
+{
+       obj.libmodes[l] = m;
+}
+
 void BuildInfo::Loader::libpath(const string &s)
 {
        obj.libpath.push_back(s);