input_suffixes.push_back(".o");
processing_unit = COMPONENT;
set_command((ms_tools.get_vc_bin_dir()/"lib.exe").str(), false);
+ set_run(_run);
}
-Target *MsvcArchiver::create_target(const list<Target *> &sources, const string &)
+Target *MsvcArchiver::create_target(const vector<Target *> &sources, const string &)
{
if(sources.empty())
throw invalid_argument("MsvcArchiver::create_target");
- list<ObjectFile *> objs;
+ vector<ObjectFile *> objs;
+ objs.reserve(sources.size());
for(Target *s: sources)
objs.push_back(&dynamic_cast<ObjectFile &>(*s));
return lib;
}
-Task *MsvcArchiver::run(const Target &target) const
+Task *MsvcArchiver::_run(const StaticLibrary &lib)
{
- const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
const Component &comp = *lib.get_component();
+ const Tool &tool = *lib.get_tool();
vector<string> argv;
- argv.push_back(executable->get_path().str());
+ argv.push_back(tool.get_executable()->get_path().str());
argv.push_back("/NOLOGO");
FS::Path work_dir = comp.get_package().get_source_directory();