X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=41dbd437cc836b75697342381f590b1c09f89fc4;hb=799d256e952913524c5e51a59c836e7a4cb52ea5;hp=d4f6d79df9e0a0e2116d4d3ed6548d00c58b6337;hpb=55269a63b0875be0b172453714f9190d30fb1dff;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index d4f6d79..41dbd43 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,17 +54,17 @@ 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;
+	const auto &incpath = build_info.incpath;
+	VirtualFileSystem::SearchPath 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());
 
-	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)
+	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()