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

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index d4f6d79..bc76605 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,14 +6,11 @@
 #include "component.h"
 #include "csourcefile.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
 
-CSourceFile::CSourceFile(Builder &b, const FS::Path &p):
-	SourceFile(b, p)
-{ }
-
 CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
 	SourceFile(b, c, p)
 {
@@ -46,24 +43,26 @@ void CSourceFile::find_dependencies()
 	{
 		IO::BufferedFile in(path.str());
 
-		builder.get_logger().log("files", format("Reading includes from %s", path.str()));
+		builder.get_logger().log("files", "Reading includes from %s", path.str());
 
 		parse_includes(in);
 		cache.set_values(this, "includes", includes);
 	}
 
 	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)
+	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()