X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuildinfo.cpp;h=114a368ecc96feabec39807621d1dc0d1a363e85;hb=3e23be616412a2b9b9a3348dad618fb399f96f67;hp=12fcac5286558e0963b97032842076c3f5feb012;hpb=95d5743c0f2a0dd8b56928525b8caa5f6ee8cc1d;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index 12fcac5..114a368 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -36,20 +36,37 @@ 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)
 		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());
+	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.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)
 	{
+		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());
 		debug = bi.debug;
 		optimize = bi.optimize;
 		strip = bi.strip;
@@ -57,14 +74,11 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 		fatal_warnings = bi.fatal_warnings;
 	}
 
-	unique();
-}
-
-void BuildInfo::unique()
-{
-	::unique(incpath);
-	::unique(libpath);
-	::unique(libs);
+	unique(incpath);
+	unique(local_incpath);
+	unique(libpath);
+	unique(libs);
+	unique(keep_symbols);
 }
 
 
@@ -74,11 +88,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);
@@ -94,6 +113,16 @@ 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;
+}
+
 void BuildInfo::Loader::libpath(const string &s)
 {
 	obj.libpath.push_back(s);
@@ -104,8 +133,23 @@ void BuildInfo::Loader::library(const string &s)
 	obj.libs.push_back(s);
 }
 
+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>>(LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
+void operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {
 	if(conv.get()=="FORCE_STATIC")
 		libmode = BuildInfo::FORCE_STATIC;