Include the toolchain name in project file build commands

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index 3f806a091e8d19a043fd3d00bc3614bf7814977f..52451f59d939c51b62796294341ee63223ab6b64 100644 (file)
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -69,10 +69,11 @@ void VcxProjectGenerator::Worker::main()
                        exe = dynamic_cast<const Executable *>(*i);
 
        const char *argv0 = Application::get_argv0();
+       const string &toolchain = builder.get_current_arch().get_toolchain();
        for(const char **i=platforms; *i; ++i)
                for(vector<string>::const_iterator j=build_types.begin(); j!=build_types.end(); ++j)
                {
-                       string base_cmd = format("%s --arch=%s --build-type=%s --prefix=%s", argv0, *i, *j, builder.get_prefix());
+                       string base_cmd = format("%s --arch=%s-%s --build-type=%s --prefix=%s", argv0, *i, toolchain, *j, builder.get_prefix());
                        IO::print(out, "\t<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='%s|%s'\" Label=\"Configuration\">\n", *j, *i);
                        IO::print(out, "\t\t<ConfigurationType>MakeFile</ConfigurationType>\n");
                        IO::print(out, "\t\t<NMakeBuildCommandLine>%s</NMakeBuildCommandLine>\n", base_cmd);