ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
FileTarget(b, c.get_package(), generate_target_path(c, s.get_path())),
- source(s)
+ source(s)
{
component = &c;
add_dependency(source);
if(*i!=".")
fn += *i;
}
- return pkg.get_temp_dir()/comp.get_name()/(FS::basepart(fn)+".o");
+ return pkg.get_temp_directory()/comp.get_name()/(FS::basepart(fn)+".o");
}
void ObjectFile::find_dependencies()
FS::Path displaced = tgt->get_path()/FS::relative(file->get_path(), rtgt->get_path());
if(Target *ddep = builder.get_vfs().get_target(displaced))
deps_to_add.push_back(ddep);
+ else
+ {
+ const Component *tcomp = file->get_component();
+ const Component::OverlayList &overlays = tcomp->get_overlays();
+ string last_dir = FS::basename(FS::dirname(displaced));
+ for(Component::OverlayList::const_iterator j=overlays.begin(); j!=overlays.end(); ++j)
+ if(last_dir==*j)
+ {
+ displaced = displaced.subpath(0, displaced.size()-2)/FS::basename(file->get_path());
+ if((ddep = builder.get_vfs().get_target(displaced)))
+ deps_to_add.push_back(ddep);
+ }
+ }
}
else
deps_to_add.push_back(*i);