X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=957d233d65ec3bff179d3e93703b5f5af1c57e7e;hb=37ffa892c453a91f06d34068e239e1ba316d7700;hp=81124b9465fef1102c5bddd4e66494139e4f47f6;hpb=c01dc113eca278100ad0b4572082da619d52662e;p=builder.git diff --git a/source/binary.cpp b/source/binary.cpp index 81124b9..957d233 100644 --- a/source/binary.cpp +++ b/source/binary.cpp @@ -3,7 +3,6 @@ #include "binary.h" #include "builder.h" #include "component.h" -#include "link.h" #include "objectfile.h" #include "sharedlibrary.h" #include "sourcepackage.h" @@ -42,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 &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);