X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=039eb8e7e52c117a8e5b3dfa14bbf25b1064ddbd;hb=451ef4f33b5a57dcb56bd7cb671bed359ac86247;hp=f6c8e56e49fc409382e0b7c399340eb6fa60ad1e;hpb=2606b03da59dc10e3826b833a2fceb0831d79972;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index f6c8e56..039eb8e 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -7,23 +7,36 @@
 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))
+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;
+}
+
+string StaticLibrary::generate_filename(const Component &comp)
+{
+	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);
 }
 
-Msp::FS::Path StaticLibrary::generate_target_path(const Component &c)
+void StaticLibrary::collect_build_info(BuildInfo &binfo) const
 {
-	const Architecture &arch = c.get_package().get_builder().get_current_arch();
-	return c.get_package().get_out_dir()/
-		arch.get_static_library_patterns().front().apply(c.get_name());
+	Target::collect_build_info(binfo);
+	binfo.update_from(build_info);
 }