for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
defines[i->first] = i->second;
incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
+ threads = bi.threads;
+ for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
+ standards[i->first] = i->second;
+
if(level!=CHAINED)
{
libpath.insert(libpath.begin(), bi.libpath.begin(), bi.libpath.end());
libs.insert(libs.begin(), bi.libs.begin(), bi.libs.end());
}
- threads = bi.threads;
+
if(level==LOCAL)
{
sysroot = bi.sysroot;
libmode = bi.libmode;
for(LibModeMap::const_iterator i=bi.libmodes.begin(); i!=bi.libmodes.end(); ++i)
libmodes[i->first] = i->second;
+ keep_symbols.insert(keep_symbols.end(), bi.keep_symbols.begin(), bi.keep_symbols.end());
debug = bi.debug;
optimize = bi.optimize;
strip = bi.strip;
}
unique(incpath);
+ unique(local_incpath);
unique(libpath);
unique(libs);
+ unique(keep_symbols);
}
add("debug", &BuildInfo::debug);
add("define", &Loader::define);
add("incpath", &Loader::incpath);
+ add("keep_symbol", &Loader::keep_symbol);
add("libpath", &Loader::libpath);
add("library", &Loader::library);
add("libmode", &BuildInfo::libmode);
add("libmode", &Loader::libmode_for_lib);
add("local_incpath", &Loader::local_incpath);
add("optimize", &BuildInfo::optimize);
+ add("standard", &Loader::standard);
add("strip", &BuildInfo::strip);
add("sysroot", &Loader::sysroot);
add("threads", &BuildInfo::threads);
obj.defines[d] = v;
}
+void BuildInfo::Loader::keep_symbol(const string &s)
+{
+ obj.keep_symbols.push_back(s);
+}
+
void BuildInfo::Loader::libmode_for_lib(const string &l, LibraryMode m)
{
obj.libmodes[l] = m;
obj.local_incpath.push_back(s);
}
+void BuildInfo::Loader::standard(DataFile::Symbol tag, const string &std)
+{
+ obj.standards[tag.name] = std;
+}
+
void BuildInfo::Loader::sysroot(const string &s)
{
obj.sysroot = s;