Make BuildInfo able to handle chained dependencies

[builder.git] / source / buildinfo.cpp

diff --git a/source/buildinfo.cpp b/source/buildinfo.cpp
index e9dcec0777e28f1201bc5a223f0853839b5d88f8..61e3162a2732b00cdec169bf2f0dcd75d7e41cef 100644 (file)
--- a/source/buildinfo.cpp
+++ b/source/buildinfo.cpp
@@ -23,14 +23,17 @@ void unique(StringList &l)
 }
 
 
-void BuildInfo::update_from(const BuildInfo &bi)
+void BuildInfo::update_from(const BuildInfo &bi, UpdateLevel level)
 {
        cflags.insert(cflags.end(), bi.cflags.begin(), bi.cflags.end());
        defines.insert(defines.end(), bi.defines.begin(), bi.defines.end());
        incpath.insert(incpath.end(), bi.incpath.begin(), bi.incpath.end());
-       ldflags.insert(ldflags.end(), bi.ldflags.begin(), bi.ldflags.end());
-       libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
-       libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+       if(level!=CHAINED)
+       {
+               ldflags.insert(ldflags.end(), bi.ldflags.begin(), bi.ldflags.end());
+               libpath.insert(libpath.end(), bi.libpath.begin(), bi.libpath.end());
+               libs.insert(libs.end(), bi.libs.begin(), bi.libs.end());
+       }
        warnings.insert(warnings.end(), bi.warnings.begin(), bi.warnings.end());
 }