Rework Tool::prepare to be able to work on other objects than self

[builder.git] / source / msvccompiler.cpp

diff --git a/source/msvccompiler.cpp b/source/msvccompiler.cpp
index c3361ee61b7993a4dad465c81487e5020037e1b3..7d751dea1882ecf2ea3cde2d946856c5768f10eb 100644 (file)
--- a/source/msvccompiler.cpp
+++ b/source/msvccompiler.cpp
@@ -73,22 +73,24 @@ string MsvcCompiler::create_build_signature(const BuildInfo &binfo) const
        return result;
 }
 
-void MsvcCompiler::do_prepare()
+void MsvcCompiler::do_prepare(ToolData &tool) const
 {
+       const std::string &tool_tag = static_cast<Tool &>(tool).get_tag();
+
        const FS::Path &vc_base_dir = ms_tools.get_vc_base_dir();
-       system_path.push_back(vc_base_dir/"include");
+       tool.system_path.push_back(vc_base_dir/"include");
 
        const FS::Path &win_sdk_dir = ms_tools.get_windows_sdk_dir();
        const string &win_sdk_ver = ms_tools.get_windows_sdk_version();
-       system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"ucrt");
-       system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"shared");
-       system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"um");
+       tool.system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"ucrt");
+       tool.system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"shared");
+       tool.system_path.push_back(win_sdk_dir/"include"/win_sdk_ver/"um");
 
        string path;
-       for(const FS::Path &p: system_path)
+       for(const FS::Path &p: tool.system_path)
        {
                append(path, ";", p.str());
-               builder.get_logger().log("tools", "Got %s system path: %s", tag, p);
+               builder.get_logger().log("tools", "Got %s system path: %s", tool_tag, p);
        }
 
        setenv("INCLUDE", path);