X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=dee807b2306027aa1a503e261f241dfbe4b4a0d7;hb=dceec8d95c63aaf4d8d4b367c9846caf9e32a6bf;hp=48935bde831b341148316fa9d5e4c29e9ec998b0;hpb=f1027d55894e624df4888f9545f1e690a2adf5ae;p=builder.git diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp index 48935bd..dee807b 100644 --- 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::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); }