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

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 56f9b32..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"
 
@@ -9,7 +10,8 @@ using namespace std;
 using namespace Msp;
 
 SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
-	Binary(b, p)
+	Binary(b, p),
+	import_lib(0)
 {
 	libname = FS::basepart(FS::basename(path));
 	if(!libname.compare(0, 3, "lib"))
@@ -18,9 +20,13 @@ SharedLibrary::SharedLibrary(Builder &b, const Msp::FS::Path &p):
 
 SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
 	Binary(b, c, generate_filename(c), objs),
-	libname(c.get_name())
+	libname(c.get_name()),
+	import_lib(0)
 {
-	install_location = "lib";
+	if(builder.get_current_arch().get_system()=="windows")
+		install_location = "bin";
+	else
+		install_location = "lib";
 	if(component->get_type()==Component::MODULE)
 		install_location /= package->get_name();
 
@@ -31,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)
@@ -48,3 +64,8 @@ string SharedLibrary::generate_filename(const Component &comp)
 		return arch.get_shared_library_patterns().front().apply(comp.get_name());
 	}
 }
+
+void SharedLibrary::set_import_library(ImportLibrary *imp)
+{
+	import_lib = imp;
+}