X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=0673a05e09b61b76ba9befbfe61a52bfe635af3c;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=6c816bd43bf3d5cf0cebdc425ada3d01d2e225fe;hpb=35f2979869bff43706f3163ec0979c7084aaa3c4;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 6c816bd..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<ObjectFile *> &objs):
+SharedLibrary::SharedLibrary(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
 	Binary(b, c, generate_filename(c), objs),
 	libname(c.get_name()),
 	import_lib(0)
@@ -37,36 +36,30 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 		if(!version.empty())
 		{
 			const Architecture &arch = builder.get_current_arch();
-			const Pattern &pattern = arch.get_shared_library_patterns().front();
 			if(arch.get_system()=="windows")
-				soname = pattern.apply(format("%s-%s", component->get_name(), version));
+				soname = arch.create_filename<SharedLibrary>(format("%s-%s", libname, version));
 			else if(arch.get_system()=="darwin")
-			{
-				string filename = pattern.apply(component->get_name());
-				string base = FS::basepart(filename);
-				string ext = FS::extpart(filename);
-				soname = format("%s.%s%s", base, version, ext);
-			}
+				soname = arch.create_filename<SharedLibrary>(format("%s.%s", libname, version));
 			else
-				soname = format("%s.%s", pattern.apply(component->get_name()), version);
+				soname = format("%s.%s", arch.create_filename<SharedLibrary>(libname), version);
 
 			install_filename = soname;
 		}
 	}
 
-	for(list<ObjectFile *>::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)
 {
 	const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(comp);
 	if(bcomp.get_type()==BinaryComponent::MODULE)
-		return comp.get_name()+".m";
+		return comp.get_name()+".dlm";
 	else
 	{
 		const Architecture &arch = comp.get_package().get_builder().get_current_arch();
-		return arch.get_shared_library_patterns().front().apply(comp.get_name());
+		return arch.create_filename<SharedLibrary>(comp.get_name());
 	}
 }