X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=7aafe90d68c1412594a086b998cb828d78605269;hb=a116ad9af4a6a75093f6e1c3603d16b397833154;hp=22f11faca352369bddce0804ae68da948e85d8b0;hpb=2aaad259f2dff58c1e909f1e6d83961e78fd7d3e;p=builder.git diff --git a/source/objectfile.cpp b/source/objectfile.cpp index 22f11fa..7aafe90 100644 --- a/source/objectfile.cpp +++ b/source/objectfile.cpp @@ -10,11 +10,11 @@ using namespace std; using namespace Msp; ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s): - FileTarget(b, &c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())), + FileTarget(b, c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())), source(s) { component = &c; - add_depend(&source); + add_depend(source); } FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src) @@ -70,5 +70,5 @@ void ObjectFile::find_depends(FileTarget *tgt) for(Dependencies::const_iterator i=deps_to_add.begin(); i!=deps_to_add.end(); ++i) if(find(depends.begin(), depends.end(), *i)==depends.end()) - add_depend(*i); + add_depend(**i); }