X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=6600b740332a23dff7a882a0a63e6c99afcbd8ec;hb=ec0d6014aa2db4a02588c9027e7dba17507df364;hp=06a99442b2fb47377044546d1646d7d599da5dcb;hpb=82ae60a647ebb9567f7177c353245f4d72faaf5e;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 06a9944..6600b74 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"
 
@@ -22,22 +23,38 @@ SharedLibrary::SharedLibrary(Builder &b, const Component &c, const list<ObjectFi
 	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();
-
-	const string &version = component->get_package().get_interface_version();
-	if(!version.empty())
+	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
-			soname = format("%s.%s", pattern.apply(component->get_name()), version);
-
-		install_filename = soname;
+		const string &version = component->get_package().get_interface_version();
+		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));
+			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)