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())),
- comp(c),
+ FileTarget(b, c.get_package(), generate_target_path(c, FS::relative(s.get_path(), c.get_package().get_source()).str())),
source(s)
{
- add_depend(&source);
+ component = &c;
+ add_depend(source);
}
FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
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);
}