X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmsvcarchiver.cpp;h=5544b2768532bc1f74b9499f0256e1e5139bb431;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=a724eb16577ae0eb9638a9287b485073fa14a227;hpb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;p=builder.git diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp index a724eb1..5544b27 100644 --- a/source/msvcarchiver.cpp +++ b/source/msvcarchiver.cpp @@ -19,19 +19,15 @@ MsvcArchiver::MsvcArchiver(Builder &b, const Architecture &a, const MicrosoftToo set_command((ms_tools.get_vc_bin_dir()/"lib.exe").str(), false); } -Target *MsvcArchiver::create_target(const list &sources, const string &) +Target *MsvcArchiver::create_target(const vector &sources, const string &) { if(sources.empty()) throw invalid_argument("MsvcArchiver::create_target"); - list objs; + vector objs; + objs.reserve(sources.size()); for(Target *s: sources) - { - if(ObjectFile *obj = dynamic_cast(s)) - objs.push_back(obj); - else - throw invalid_argument("MsvcArchiver::create_target"); - } + objs.push_back(&dynamic_cast(*s)); const Component &comp = *objs.front()->get_component(); StaticLibrary *lib = new StaticLibrary(builder, comp, objs); @@ -39,11 +35,6 @@ Target *MsvcArchiver::create_target(const list &sources, const string return lib; } -string MsvcArchiver::create_build_signature(const BuildInfo &) const -{ - return FS::basename(executable->get_path()); -} - Task *MsvcArchiver::run(const Target &target) const { const StaticLibrary &lib = dynamic_cast(target);