X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=7a3e7a5b6a34e0a58694323fd203f87c42bfd7e0;hb=353f5d442804296ad5c8d457fd60d55756a57fba;hp=a06bd2031bbbf33e9607bd8184c04066153ae377;hpb=d6e5645659cc31231e6da5028ddd0e0aeca19218;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index a06bd20..7a3e7a5 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -12,15 +12,15 @@ using namespace std;
 using namespace Msp;
 
 Binary::Binary(Builder &b, const FS::Path &p):
-	FileTarget(b, 0, p)
+	FileTarget(b, p)
 { }
 
 Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/p)
+	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p)
 {
 	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
-		add_depend(*i);
+		add_depend(**i);
 }
 
 void Binary::find_depends()
@@ -44,7 +44,7 @@ void Binary::find_depends()
 		const BuildInfo::PathList &libpath = c->get_build_info().libpath;
 
 		const BuildInfo::WordList &libs = c->get_build_info().libs;
-		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+		for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
 		{
 			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
 			if(lib)
@@ -68,6 +68,6 @@ void Binary::find_depends()
 		for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
 			last = (j==i || *j!=*i);
 		if(last)
-			add_depend(*i);
+			add_depend(**i);
 	}
 }