X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvcxprojectgenerator.cpp;h=52451f59d939c51b62796294341ee63223ab6b64;hb=9dd42116ce72f8b2288ab535f89242f87a44337a;hp=b5c42c5c2f0ce3715f552996ae47a28e25a49d1a;hpb=84da3f6c94dbe7e36aaf088890fda5fcf3b3efb0;p=builder.git

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index b5c42c5..52451f5 100644
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -43,7 +43,7 @@ void VcxProjectGenerator::Worker::main()
 
 	IO::print(out, "\t<ItemGroup Label=\"ProjectConfigurations\">\n");
 	vector<string> build_types = builder.get_build_types();
-	const char *platforms[] = { "x86-32", "x86-64", 0 };
+	const char *platforms[] = { "Win32", "x64", 0 };
 	for(const char **i=platforms; *i; ++i)
 		for(vector<string>::const_iterator j=build_types.begin(); j!=build_types.end(); ++j)
 		{
@@ -69,16 +69,19 @@ 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-%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 --arch=%s --build-type=%s</NMakeBuildCommandLine>\n", argv0, *i, *j);
-			IO::print(out, "\t\t<NMakeCleanCommandLine>%s --arch=%s --build-type=%s -c</NMakeCleanCommandLine>\n", argv0, *i, *j);
-			IO::print(out, "\t\t<NMakeReBuildCommandLine>%s --arch=%s --build-type=%s -B</NMakeReBuildCommandLine>\n", argv0, *i, *j);
+			IO::print(out, "\t\t<NMakeBuildCommandLine>%s</NMakeBuildCommandLine>\n", base_cmd);
+			IO::print(out, "\t\t<NMakeCleanCommandLine>%s -c</NMakeCleanCommandLine>\n", base_cmd);
+			IO::print(out, "\t\t<NMakeReBuildCommandLine>%s -B</NMakeReBuildCommandLine>\n", base_cmd);
 			if(exe)
 				IO::print(out, "\t\t<NMakeOutput>%s</NMakeOutput>\n", exe->get_path());
+			IO::print(out, "\t\t\t<PlatformToolset>v142</PlatformToolset>\n");
 			IO::print(out, "\t</PropertyGroup>\n");
 		}