X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=1d598caa7a42a56178d25cee7b9f35800f903098;hb=8f8f10fe41bbb68866e8fb05f8cbab0b325dc7da;hp=5ea1b344069c034c07636b3e0a848b05fe64b9b7;hpb=b1c51196b34f644e821f351c2acdb48619aed2e3;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 5ea1b34..1d598ca 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -48,19 +48,23 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
 	for(DefineMap::const_iterator i=bi.defines.begin(); i!=bi.defines.end(); ++i)
 		defines[i->first] = i->second;
-	incpath.insert(incpath.end(), bi.incpath.begin(), bi.incpath.end());
+	incpath.insert(incpath.begin(), bi.incpath.begin(), bi.incpath.end());
 	if(level!=CHAINED)
 	{
-		libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-		libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+		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)
 	{
-		local_incpath.insert(local_incpath.end(), bi.local_incpath.begin(), bi.local_incpath.end());
+		sysroot = bi.sysroot;
+		local_incpath.insert(local_incpath.begin(), bi.local_incpath.begin(), bi.local_incpath.end());
 		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());
+		for(StandardMap::const_iterator i=bi.standards.begin(); i!=bi.standards.end(); ++i)
+			standards[i->first] = i->second;
 		debug = bi.debug;
 		optimize = bi.optimize;
 		strip = bi.strip;
@@ -80,13 +84,16 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	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);
 	add("warning_level", &BuildInfo::warning_level);
 	add("fatal_warnings", &BuildInfo::fatal_warnings);
@@ -102,6 +109,11 @@ void BuildInfo::Loader::define(const string &d, const string &v)
 	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;
@@ -122,6 +134,16 @@ void BuildInfo::Loader::local_incpath(const string &s)
 	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;
+}
+
 
 void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {