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

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index c5df4d5..a173829 100644
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -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");
@@ -90,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))
 				{
@@ -105,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)