X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchive.cpp;h=8b36391aece95ba911537fbd5f6dfba93dfaea2d;hb=66d1078c04849ec17a7343d0494d6ed087e04318;hp=204b202c4863c112593edc50cf6e1d8fe0d53bcf;hpb=242c55b17e6608b29a77ca17a5b677e202a3ca90;p=builder.git diff --git a/source/archive.cpp b/source/archive.cpp index 204b202..8b36391 100644 --- a/source/archive.cpp +++ b/source/archive.cpp @@ -28,13 +28,13 @@ Archive::Archive(Builder &b, const StaticLibrary &lib): argv.push_back(builder.get_current_arch().get_tool(tool)); argv.push_back("rc"); - argv.push_back(relative(lib.get_name(), work_dir).str()); + argv.push_back(relative(lib.get_path(), work_dir).str()); const TargetList &deps=lib.get_depends(); for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i) - if(dynamic_cast(*i)) - argv.push_back(relative((*i)->get_name(), work_dir).str()); + if(ObjectFile *obj=dynamic_cast(*i)) + argv.push_back(relative(obj->get_path(), work_dir).str()); - FS::Path lpath=lib.get_name(); + FS::Path lpath=lib.get_path(); if(!builder.get_dry_run()) FS::mkpath(FS::dirname(lpath), 0755);