X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=17ec7353998f7fc7078c70d56bbb99762dfb7fa2;hb=2606b03da59dc10e3826b833a2fceb0831d79972;hp=ff98644ec53a6711ed3e63910a0876bd6447dc40;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index ff98644..17ec735 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -12,8 +12,12 @@
 using namespace std;
 using namespace Msp;
 
-Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, &c.get_package(), generate_target_path(c))
+Binary::Binary(Builder &b, const FS::Path &p):
+	FileTarget(b, 0, p)
+{ }
+
+Binary::Binary(Builder &b, const Component &c, const std::string &p, const list<ObjectFile *> &objs):
+	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)
@@ -23,7 +27,10 @@ Binary::Binary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
 void Binary::find_depends()
 {
 	if(!component)
+	{
+		deps_ready = true;
 		return;
+	}
 
 	const SourcePackage &spkg = component->get_package();
 	LibMode libmode = spkg.get_library_mode();
@@ -70,28 +77,3 @@ void Binary::find_depends()
 
 	deps_ready = true;
 }
-
-FS::Path Binary::generate_target_path(const Component &c)
-{
-	const SourcePackage &pkg = c.get_package();
-	string prefix, suffix;
-	const string &sys = pkg.get_builder().get_current_arch().get_system();
-
-	if(c.get_type()==Component::LIBRARY)
-	{
-		prefix = "lib";
-		if(sys=="windows")
-			suffix = ".dll";
-		else
-			suffix = ".so";
-	}
-	else if(c.get_type()==Component::MODULE)
-		suffix = ".m";
-	else if(c.get_type()==Component::PROGRAM)
-	{
-		if(sys=="windows")
-			suffix = ".exe";
-	}
-
-	return pkg.get_out_dir()/(prefix+c.get_name()+suffix);
-}