-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2010 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;
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));
}
}
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();