Adjust requires to library changes

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index c4eea79eee84fa2b4c76d18c5f8e3619746513d9..7be7889974c4733faf923b8be4b9563a4f970d50 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,14 +1,13 @@
 #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)
@@ -28,12 +27,15 @@ void SourceFile::find_depends()
        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);
        }