X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=0673a05e09b61b76ba9befbfe61a52bfe635af3c;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=5e479f3c9f652f64c03a9ab3eb472ae645c807ed;hpb=bf0883b6dd3946612922aa1b7c04a87d06442df7;p=builder.git diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp index 5e479f3..0673a05 100644 --- a/source/sharedlibrary.cpp +++ b/source/sharedlibrary.cpp @@ -10,15 +10,14 @@ using namespace std; using namespace Msp; SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p): - Binary(b, p), - import_lib(0) + Binary(b, p) { libname = FS::basepart(FS::basename(path)); if(!libname.compare(0, 3, "lib")) libname = libname.substr(3); } -SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list &objs): +SharedLibrary::SharedLibrary(Builder &b, const Component &c, const vector &objs): Binary(b, c, generate_filename(c), objs), libname(c.get_name()), import_lib(0) @@ -48,8 +47,8 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list::const_iterator i=objects.begin(); i!=objects.end(); ++i) - (*i)->set_used_in_shared_library(true); + for(ObjectFile *o: objects) + o->set_used_in_shared_library(true); } string SharedLibrary::generate_filename(const Component &comp)