X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuildinfo.cpp;h=5ea1b344069c034c07636b3e0a848b05fe64b9b7;hb=9e28243c9687608ec3c32954b4031490296ae877;hp=ad06ed89a52e0b23e56401e1c9e414040a6152d6;hpb=323285f97a1a6fe2628f818371a8b03f233dd036;p=builder.git

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index ad06ed8..5ea1b34 100644
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -57,6 +57,7 @@ void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 	threads = bi.threads;
 	if(level==LOCAL)
 	{
+		local_incpath.insert(local_incpath.end(), 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;
@@ -83,6 +84,7 @@ BuildInfo::Loader::Loader(BuildInfo &bi):
 	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("strip",    &BuildInfo::strip);
 	add("threads",  &BuildInfo::threads);
@@ -115,6 +117,11 @@ 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 operator>>(const LexicalConverter &conv, BuildInfo::LibraryMode &libmode)
 {