X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdatatool.cpp;h=75ec2da7b750998d77395ba6ba57e8d77afd87a0;hb=407b96515a5246384847d1835a2d69704e941ea1;hp=eeeec4ea68b30706a670c6b84ffd0af98d64cfdf;hpb=7ed7c30ee0ceb734f17fe0c6d4bc6d37fb2ab5a7;p=builder.git

diff --git a/source/datatool.cpp b/source/datatool.cpp
index eeeec4e..75ec2da 100644
--- a/source/datatool.cpp
+++ b/source/datatool.cpp
@@ -15,6 +15,7 @@ using namespace Msp;
 DataTool::DataTool(Builder &b):
 	Tool(b, "DATA")
 {
+	set_command("mspdatatool");
 	input_suffixes.push_back(".mdt");
 }
 
@@ -47,9 +48,18 @@ Target *DataTool::create_target(const list<Target *> &sources, const string &arg
 		throw invalid_argument("DataTool::create_target");
 }
 
-void DataTool::do_prepare()
+string DataTool::create_build_signature(const BuildInfo &binfo) const
 {
-	set_executable("mspdatatool");
+	string result;
+	if(binfo.debug)
+		result += 'g';
+	if(binfo.optimize>0)
+	{
+		result += 'b';
+		if(binfo.optimize>1)
+			result += 'z';
+	}
+	return result;
 }
 
 Task *DataTool::run(const Target &tgt) const
@@ -63,7 +73,8 @@ Task *DataTool::run(const Target &tgt) const
 	argv.push_back("-o");
 	argv.push_back(FS::relative(dynamic_cast<const FileTarget &>(tgt).get_path(), work_dir).str());
 
-	const BuildInfo &binfo = comp.get_build_info();
+	BuildInfo binfo;
+	tgt.collect_build_info(binfo);
 	if(binfo.debug)
 		argv.push_back("-g");
 	if(binfo.optimize>0)