#include "binary.h"
#include "builder.h"
#include "component.h"
-#include "link.h"
#include "objectfile.h"
#include "sharedlibrary.h"
#include "sourcepackage.h"
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 std::string &p, const list<ObjectFile *> &objs):
- FileTarget(b, &c.get_package(), c.get_package().get_out_dir()/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)
{
component = &c;
for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
void Binary::find_depends()
{
if(!component)
- {
- deps_ready = true;
return;
- }
const SourcePackage &spkg = component->get_package();
LibMode libmode = spkg.get_library_mode();
const Component *c = queue.front();
queue.erase(queue.begin());
- const StringList &libpath = c->get_build_info().libpath;
+ const BuildInfo::PathList &libpath = c->get_build_info().libpath;
- const list<string> &libs = c->get_build_info().libs;
- for(StringList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+ const BuildInfo::WordList &libs = c->get_build_info().libs;
+ for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
{
Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
if(lib)
if(last)
add_depend(*i);
}
-
- deps_ready = true;
}