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

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index b5c42c5..a173829 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)
 		{
@@ -57,6 +57,7 @@ void VcxProjectGenerator::Worker::main()
 	IO::print(out, "\t<PropertyGroup Label=\"Globals\">\n");
 	IO::print(out, "\t\t<VCProjectVersion>15.0</VCProjectVersion>\n");
 	IO::print(out, "\t\t<Keyword>MakeFileProj</Keyword>\n");
+	IO::print(out, "\t\t<ProjectGuid>{%s}</ProjectGuid>\n", target.get_guid());
 	IO::print(out, "\t</PropertyGroup>\n");
 
 	IO::print(out, "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />\n");
@@ -69,14 +70,16 @@ 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</PropertyGroup>\n");
@@ -88,9 +91,17 @@ void VcxProjectGenerator::Worker::main()
 	vector<const FileTarget *> sources;
 	vector<const FileTarget *> includes;
 	vector<const FileTarget *> others;
+	BuildInfo build_info;
 	for(BuildGraph::TargetMap::const_iterator i=targets.begin(); i!=targets.end(); ++i)
-		if(i->second->get_package()==&spkg && !i->second->is_buildable())
-			if(const FileTarget *file = dynamic_cast<const FileTarget *>(i->second))
+		if(i->second->get_package()==&spkg)
+		{
+			if(i->second->is_buildable())
+			{
+				BuildInfo tgt_binfo;
+				i->second->collect_build_info(tgt_binfo);
+				build_info.update_from(tgt_binfo, BuildInfo::CHAINED);
+			}
+			else if(const FileTarget *file = dynamic_cast<const FileTarget *>(i->second))
 			{
 				if(dynamic_cast<const CSourceFile *>(file))
 				{
@@ -103,6 +114,17 @@ void VcxProjectGenerator::Worker::main()
 				else
 					others.push_back(file);
 			}
+		}
+
+	if(!build_info.incpath.empty())
+	{
+		IO::print(out, "\t<PropertyGroup>\n");
+		string path_str;
+		for(BuildInfo::PathList::const_iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i)
+			append(path_str, ";", i->str());
+		IO::print(out, "\t\t<NMakeIncludeSearchPath>%s</NMakeIncludeSearchPath>\n", path_str);
+		IO::print(out, "\t</PropertyGroup>\n");
+	}
 
 	IO::print(out, "\t<ItemGroup>\n");
 	for(vector<const FileTarget *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)