X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsharedlibrary.cpp;h=e94ffeb6d46867813b4c18a23e7fbb74bb00e3c3;hb=d9028dec3b81c84560c580008fa68490f049e723;hp=24e0e205682acec12951035b32d84bc26a9a0ece;hpb=8932cbfa8cdb0b9edf9894bd4c56980dab0a2f4b;p=builder.git

diff --git a/source/sharedlibrary.cpp b/source/sharedlibrary.cpp
index 24e0e20..e94ffeb 100644
--- a/source/sharedlibrary.cpp
+++ b/source/sharedlibrary.cpp
@@ -9,7 +9,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,24 +19,27 @@ 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 += '/';
-		install_location += package->get_name();
-	}
+		install_location /= package->get_name();
 
-	const string &version = component->get_package().get_version();
+	const string &version = component->get_package().get_interface_version();
 	if(!version.empty())
 	{
-		string::size_type i = 0;
-		for(unsigned dots=0; i<version.size(); ++i)
-			if(version[i]=='.' && ++dots>=2)
-				break;
+		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);
 
-		soname = format("%s.%s", FS::basename(path), version.substr(0, i));
+		install_filename = soname;
 	}
 }
 
@@ -49,3 +53,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;
+}