X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=305061a02c5bd7c617ad8c4b8febb57d4ddd8197;hb=0f7867524bf87a389ff5d4f9d3290d68a254b693;hp=e94ffeb6d46867813b4c18a23e7fbb74bb00e3c3;hpb=4ba3ef9601166127d0782b3e6a3352b71db7ccc9;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index e94ffeb..305061a 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -2,6 +2,7 @@
 #include <msp/strings/format.h>
 #include "builder.h"
 #include "component.h"
+#include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
 
@@ -36,11 +37,21 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 		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")
+		{
+			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);
 
 		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)