Make tools capable of reporting a system-wide path used to locate input files

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 48935bde831b341148316fa9d5e4c29e9ec998b0..dee807b2306027aa1a503e261f241dfbe4b4a0d7 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -51,11 +51,12 @@ void CSourceFile::find_depends()
        }
 
        const StringList &incpath = comp->get_build_info().incpath;
+       StringList local_incpath = incpath;
+       local_incpath.push_front(FS::dirname(path).str());
 
-       FS::Path dir = FS::dirname(path);
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr = builder.get_vfs().find_header(*i, dir, incpath);
+               Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
                if(hdr)
                        add_depend(hdr);
        }