Don't store component locally in object and source files

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 421697d623fe9226d40777f9e31b9343eb20299c..a06bd2031bbbf33e9607bd8184c04066153ae377 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -15,7 +15,7 @@ Binary::Binary(Builder &b, const FS::Path &p):
        FileTarget(b, 0, p)
 { }
 
-Binary::Binary(Builder &b, const Component &c, const std::string &p, const list<ObjectFile *> &objs):
+Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
        FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/p)
 {
        component = &c;
@@ -41,9 +41,9 @@ void Binary::find_depends()
                const Component *c = queue.front();
                queue.erase(queue.begin());
 
-               const StringList &libpath = c->get_build_info().libpath;
+               const BuildInfo::PathList &libpath = c->get_build_info().libpath;
 
-               const list<string> &libs = c->get_build_info().libs;
+               const BuildInfo::WordList &libs = c->get_build_info().libs;
                for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
                {
                        Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);