using namespace Msp;
StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
- FileTarget(b, 0, p)
+ FileTarget(b, p)
{ }
StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
- FileTarget(b, &c.get_package(), generate_target_path(c))
+ FileTarget(b, c.get_package(), c.get_package().get_out_dir()/generate_filename(c))
{
component = &c;
for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
- add_depend(*i);
+ add_depend(**i);
install_location = "lib";
}
-Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)
+string StaticLibrary::generate_filename(const Component &comp)
{
- const Architecture &arch = c.get_package().get_builder().get_current_arch();
- return c.get_package().get_out_dir()/
- arch.get_static_library_patterns().front().apply(c.get_name());
+ const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+ return arch.get_static_library_patterns().front().apply(comp.get_name());
}