X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimportlibrary.cpp;h=9d2ea8fae42da17f392d6913e0bdd1d8181c4121;hb=d1f9551e05c9d341149eb490e05b1465d3d6b711;hp=0fb5f72ff88d3628f46723fa5cb09dd3f4dc49a0;hpb=a957405689fafa1afc233182a3756e36ea34281c;p=builder.git

diff --git a/source/importlibrary.cpp b/source/importlibrary.cpp
index 0fb5f72..9d2ea8f 100644
--- a/source/importlibrary.cpp
+++ b/source/importlibrary.cpp
@@ -1,4 +1,6 @@
 #include <msp/strings/format.h>
+#include "architecture.h"
+#include "builder.h"
 #include "component.h"
 #include "exportdefinitions.h"
 #include "importlibrary.h"
@@ -9,12 +11,11 @@ using namespace std;
 using namespace Msp;
 
 ImportLibrary::ImportLibrary(Builder &b, const FS::Path &p):
-	FileTarget(b, p),
-	shared_lib(0)
+	FileTarget(b, p)
 { }
 
 ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl, ExportDefinitions &exp):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/format("lib%s.dll.a", sl.get_libname())),
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c, sl)),
 	shared_lib(&sl)
 {
 	component = &c;
@@ -25,5 +26,14 @@ ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl,
 
 	const string &version = component->get_package().get_interface_version();
 	if(!version.empty())
-		install_filename = format("lib%s-%s.dll.a", sl.get_libname(), version);
+	{
+		const Architecture &arch = builder.get_current_arch();
+		install_filename = arch.create_filename<ImportLibrary>(format("%s-%s", sl.get_libname(), version));
+	}
+}
+
+string ImportLibrary::generate_filename(const Component &comp, const SharedLibrary &sl)
+{
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return arch.create_filename<ImportLibrary>(sl.get_libname());
 }