/* $Id$
This file is part of builder
-Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions
Distributed under the LGPL
*/
{
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));
}
}
{
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";
suffix = ".m";
else if(c.get_type()==Component::PROGRAM)
{
- if(arch=="win32")
+ if(sys=="windows")
suffix = ".exe";
}