X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=9ee4a9a79771326c019206bc402645e32aa0b2b8;hb=6382743d26f8d5bb10a53cb907659bee6614b549;hp=db04f0a80ef2ec9094acbace22d7b2187b78293d;hpb=6026d07fec5132c04fa94d61cef2fd59cffeb4b8;p=builder.git diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp index db04f0a..9ee4a9a 100644 --- a/source/staticlibrary.cpp +++ b/source/staticlibrary.cpp @@ -8,17 +8,19 @@ using namespace std; 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 &objs): - FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/generate_filename(c)) + FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c)) { component = &c; for(list::const_iterator i=objs.begin(); i!=objs.end(); ++i) - add_depend(*i); + add_dependency(**i); install_location = "lib"; + nested_build_sig = true; + arch_in_build_sig = true; } string StaticLibrary::generate_filename(const Component &comp)