X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=2d0a409c5f2c53835fd38f6457e8fcccabb37ee6;hb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;hp=a06bd2031bbbf33e9607bd8184c04066153ae377;hpb=d6e5645659cc31231e6da5028ddd0e0aeca19218;p=builder.git diff --git a/source/binary.cpp b/source/binary.cpp index a06bd20..2d0a409 100644 --- a/source/binary.cpp +++ b/source/binary.cpp @@ -12,11 +12,11 @@ using namespace std; using namespace Msp; Binary::Binary(Builder &b, const FS::Path &p): - FileTarget(b, 0, p) + FileTarget(b, p) { } Binary::Binary(Builder &b, const Component &c, const string &p, const list &objs): - FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/p) + FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p) { component = &c; for(list::const_iterator i=objs.begin(); i!=objs.end(); ++i) @@ -44,7 +44,7 @@ void Binary::find_depends() const BuildInfo::PathList &libpath = c->get_build_info().libpath; const BuildInfo::WordList &libs = c->get_build_info().libs; - for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i) + for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i) { Target *lib = builder.get_vfs().find_library(*i, libpath, libmode); if(lib)