+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
#include <fstream>
-#include <msp/regex++/regex++.h>
+#include <msp/strings/regex.h>
#include "builder.h"
#include "component.h"
+#include "package.h"
#include "sourcefile.h"
using namespace std;
using namespace Msp;
-#include <iostream>
-
SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
Target(b, c?&c->get_package():0, n),
comp(c)
string line;
while(getline(in, line))
if(RegMatch match=r_include.match(line))
- includes.push_back(match[1].str());
+ includes.push_back(match[1].str);
+
+ const StringList &incpath=comp->get_build_info().incpath;
+ const string &arch=comp->get_package().get_arch();
string path=name.substr(0, name.rfind('/'));
for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
{
- Target *hdr=builder.get_header(*i, path, comp->get_build_info().incpath);
+ Target *hdr=builder.get_header(*i, arch, path, incpath);
if(hdr)
add_depend(hdr);
}