X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=d73c59450f97501bcab4d32554fc33f9ef8724ce;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=08da59af1c82a4de868cfdb20381a60857d06321;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 08da59a..d73c594 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,20 +1,12 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/utils.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "binary.h"
 #include "builder.h"
 #include "component.h"
-#include "install.h"
 #include "link.h"
 #include "objectfile.h"
-#include "package.h"
 #include "sharedlibrary.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -48,18 +40,17 @@ void Binary::find_depends()
 		const list<string> &libs = c->get_build_info().libs;
 		for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
 		{
-			Target *lib = builder.get_library(*i, libpath, libmode);
+			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
 			if(lib)
 			{
 				dep_libs.push_back(lib);
 
-				if(Install *inst = dynamic_cast<Install *>(lib))
-					lib = &inst->get_source();
+				lib = lib->get_real_target();
 				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
 					queue.push_back(&stlib->get_component());
 			}
 			else
-				builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, FS::basename(name)));
+				builder.problem(comp.get_package().get_name(), format("Couldn't find library %s for %s", *i, name));
 		}
 	}
 
@@ -77,21 +68,16 @@ void Binary::find_depends()
 	deps_ready = true;
 }
 
-Action *Binary::create_action()
-{
-	return new Link(builder, *this);
-}
-
 FS::Path Binary::generate_target_path(const Component &c)
 {
 	const SourcePackage &pkg = c.get_package();
 	string prefix, suffix;
-	const string &arch = pkg.get_builder().get_current_arch().get_name();
+	const string &sys = pkg.get_builder().get_current_arch().get_system();
 
 	if(c.get_type()==Component::LIBRARY)
 	{
 		prefix = "lib";
-		if(arch=="win32")
+		if(sys=="windows")
 			suffix = ".dll";
 		else
 			suffix = ".so";
@@ -100,7 +86,7 @@ FS::Path Binary::generate_target_path(const Component &c)
 		suffix = ".m";
 	else if(c.get_type()==Component::PROGRAM)
 	{
-		if(arch=="win32")
+		if(sys=="windows")
 			suffix = ".exe";
 	}