X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=db04f0a80ef2ec9094acbace22d7b2187b78293d;hb=4facd021514ab372c23b1b132d6b4b62baa4efbf;hp=45ec3df5b64a0251ae00506706f7b4ae81314de6;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 45ec3df..db04f0a 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,13 +1,18 @@
+#include "builder.h"
 #include "component.h"
 #include "objectfile.h"
 #include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
+using namespace Msp;
+
+StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
+	FileTarget(b, 0, p)
+{ }
 
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), generate_target_path(c)),
-	Library(b, package, path, c.get_name())
+	FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/generate_filename(c))
 {
 	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
@@ -16,7 +21,8 @@ StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFi
 	install_location = "lib";
 }
 
-Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)
+string StaticLibrary::generate_filename(const Component &comp)
 {
-	return c.get_package().get_out_dir()/("lib"+c.get_name()+".a");
+	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
+	return arch.get_static_library_patterns().front().apply(comp.get_name());
 }