X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=e9b0bc8dca7d9c67a7e10d251120de4ac9e593b9;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=e34ff279cc4c98d199b491c075e17bc4c689a449;hpb=7bcd4fef81679dedcabc5a58b12511a6b52c4fe4;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index e34ff27..e9b0bc8 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,6 +6,7 @@
 #include "component.h"
 #include "csourcefile.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -53,22 +54,24 @@ void CSourceFile::find_dependencies()
 	}
 
 	const BuildInfo &build_info = component->get_build_info_for_path(path);
-	const BuildInfo::PathList &incpath = build_info.incpath;
-	BuildInfo::PathList local_incpath = incpath;
-	local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
-	local_incpath.push_front(FS::dirname(path).str());
+	const auto &incpath = build_info.incpath;
+	VirtualFileSystem::SearchPath local_incpath;
+	local_incpath.reserve(1+build_info.local_incpath.size()+incpath.size());
+	local_incpath.push_back(FS::dirname(path).str());
+	local_incpath.insert(local_incpath.end(), build_info.local_incpath.begin(), build_info.local_incpath.end());
+	local_incpath.insert(local_incpath.end(), incpath.begin(), incpath.end());
 
-	for(IncludeList::iterator i=includes.begin(); i!=includes.end(); ++i)
-	{
-		Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
-		if(hdr)
-			add_dependency(*hdr);
-	}
+	Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
+	if(compiler)
+		compiler->prepare();
+	for(const string &i: includes)
+		if(Target *hdr = builder.get_vfs().find_header(i.substr(1), compiler, (i[0]=='"' ? local_incpath : incpath)))
+			add_transitive_dependency(*hdr);
 }
 
 void CSourceFile::modified()
 {
 	includes.clear();
-	depends.clear();
+	trans_depends.clear();
 	find_dependencies();
 }