X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=c51596685d8927debc0afb5e5bb481b327f2dffb;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=556ee54295963e8c55b7483947f6289160207da1;hpb=dc4b917034c9d3718f07139e2f0f3631a080c6f3;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 556ee54..c515966 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -1,3 +1,4 @@
+#include "builder.h"
 #include "component.h"
 #include "objectfile.h"
 #include "sourcepackage.h"
@@ -7,20 +8,39 @@ using namespace std;
 using namespace Msp;
 
 StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
-	FileTarget(b, 0, p)
+	FileTarget(b, p)
 { }
 
-StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), generate_target_path(c))
+StaticLibrary::StaticLibrary(Builder &b, const Component &c, const vector<ObjectFile *> &objs):
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
 	component = &c;
-	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-		add_depend(*i);
+	for(ObjectFile *o: objs)
+		add_dependency(*o);
 
 	install_location = "lib";
+	nested_build_sig = true;
+	arch_in_build_sig = true;
 }
 
-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.create_filename<StaticLibrary>(comp.get_name());
+}
+
+void StaticLibrary::add_required_library(const string &lib)
+{
+	build_info.libs.push_back(lib);
+}
+
+void StaticLibrary::add_library_path(const FS::Path &pth)
+{
+	build_info.libpath.push_back(pth);
+}
+
+void StaticLibrary::collect_build_info(BuildInfo &binfo) const
+{
+	Target::collect_build_info(binfo);
+	binfo.update_from(build_info);
 }