X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=5e479f3c9f652f64c03a9ab3eb472ae645c807ed;hb=bf0883b6dd3946612922aa1b7c04a87d06442df7;hp=ae44f2cd5751701dff67a5e18dc29183960adb6b;hpb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index ae44f2c..5e479f3 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -1,7 +1,8 @@
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include "binarycomponent.h"
 #include "builder.h"
-#include "component.h"
+#include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
@@ -26,38 +27,40 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 		install_location = "bin";
 	else
 		install_location = "lib";
-	if(component->get_type()==Component::MODULE)
-		install_location /= package->get_name();
 
-	const string &version = component->get_package().get_interface_version();
-	if(!version.empty())
+	const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(*component);
+	if(bcomp.get_type()==BinaryComponent::MODULE)
+		install_location /= package->get_name();
+	else
 	{
-		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));
-		else if(arch.get_system()=="darwin")
+		const string &version = component->get_package().get_interface_version();
+		if(!version.empty())
 		{
-			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);
-		}
-		else
-			soname = format("%s.%s", pattern.apply(component->get_name()), version);
+			const Architecture &arch = builder.get_current_arch();
+			if(arch.get_system()=="windows")
+				soname = arch.create_filename<SharedLibrary>(format("%s-%s", libname, version));
+			else if(arch.get_system()=="darwin")
+				soname = arch.create_filename<SharedLibrary>(format("%s.%s", libname, version));
+			else
+				soname = format("%s.%s", arch.create_filename<SharedLibrary>(libname), version);
 
-		install_filename = soname;
+			install_filename = soname;
+		}
 	}
+
+	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+		(*i)->set_used_in_shared_library(true);
 }
 
 string SharedLibrary::generate_filename(const Component &comp)
 {
-	if(comp.get_type()==Component::MODULE)
-		return comp.get_name()+".m";
+	const BinaryComponent &bcomp = dynamic_cast<const BinaryComponent &>(comp);
+	if(bcomp.get_type()==BinaryComponent::MODULE)
+		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());
 	}
 }