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

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index e34ff27..0034ebd 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;
@@ -58,17 +59,20 @@ void CSourceFile::find_dependencies()
 	local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
 	local_incpath.push_front(FS::dirname(path).str());
 
+	Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
+	if(compiler)
+		compiler->prepare();
 	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));
+		Target *hdr = builder.get_vfs().find_header(i->substr(1), compiler, ((*i)[0]=='"' ? local_incpath : incpath));
 		if(hdr)
-			add_dependency(*hdr);
+			add_transitive_dependency(*hdr);
 	}
 }
 
 void CSourceFile::modified()
 {
 	includes.clear();
-	depends.clear();
+	trans_depends.clear();
 	find_dependencies();
 }