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

diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index 52451f5..93c0eb4 100644
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -16,7 +16,7 @@ VcxProjectGenerator::VcxProjectGenerator(Builder &b):
 	Tool(b, "VCXG")
 { }
 
-Target *VcxProjectGenerator::create_target(const list<Target *> &, const string &)
+Target *VcxProjectGenerator::create_target(const vector<Target *> &, const string &)
 {
 	throw logic_error("Not implemented");
 }
@@ -43,13 +43,13 @@ void VcxProjectGenerator::Worker::main()
 
 	IO::print(out, "\t<ItemGroup Label=\"ProjectConfigurations\">\n");
 	vector<string> build_types = builder.get_build_types();
-	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)
+	const char *platforms[] = { "Win32", "x64" };
+	for(const char *p: platforms)
+		for(const string &b: build_types)
 		{
-			IO::print(out, "\t\t<ProjectConfiguration Include=\"%s|%s\">\n", *j, *i);
-			IO::print(out, "\t\t\t<Configuration>%s</Configuration>\n", *j);
-			IO::print(out, "\t\t\t<Platform>%s</Platform>\n", *i);
+			IO::print(out, "\t\t<ProjectConfiguration Include=\"%s|%s\">\n", b, p);
+			IO::print(out, "\t\t\t<Configuration>%s</Configuration>\n", b);
+			IO::print(out, "\t\t\t<Platform>%s</Platform>\n", p);
 			IO::print(out, "\t\t</ProjectConfiguration>\n");
 		}
 	IO::print(out, "\t</ItemGroup>\n");
@@ -57,43 +57,49 @@ 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");
 
-	const Target *world = builder.get_build_graph().get_target("world");
-	const Target::Dependencies &world_deps = world->get_dependencies();
 	const Executable *exe = 0;
-	for(Target::Dependencies::const_iterator i=world_deps.begin(); (!exe && i!=world_deps.end()); ++i)
-		if((*i)->get_package()==&spkg)
-			exe = dynamic_cast<const Executable *>(*i);
+	for(const Target *t: builder.get_build_graph().get_target("world")->get_dependencies())
+		if(t->get_package()==&spkg)
+			if((exe = dynamic_cast<const Executable *>(t)))
+				break;
 
 	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)
+	for(const char *p: platforms)
+		for(const string &b: build_types)
 		{
-			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);
+			string base_cmd = format("%s --arch=%s-%s --build-type=%s --prefix=%s", argv0, p, toolchain, b, builder.get_prefix());
+			IO::print(out, "\t<PropertyGroup Condition=\"'$(Configuration)|$(Platform)'=='%s|%s'\" Label=\"Configuration\">\n", b, p);
 			IO::print(out, "\t\t<ConfigurationType>MakeFile</ConfigurationType>\n");
 			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");
 		}
 
 	IO::print(out, "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.props\" />\n");
 
-	const BuildGraph::TargetMap &targets = builder.get_build_graph().get_targets();
 	vector<const FileTarget *> sources;
 	vector<const FileTarget *> includes;
 	vector<const FileTarget *> others;
-	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))
+	BuildInfo build_info;
+	for(const auto &kvp: builder.get_build_graph().get_targets())
+		if(kvp.second->get_package()==&spkg)
+		{
+			if(kvp.second->is_buildable())
+			{
+				BuildInfo tgt_binfo;
+				kvp.second->collect_build_info(tgt_binfo);
+				build_info.update_from(tgt_binfo, BuildInfo::CHAINED);
+			}
+			else if(const FileTarget *file = dynamic_cast<const FileTarget *>(kvp.second))
 			{
 				if(dynamic_cast<const CSourceFile *>(file))
 				{
@@ -106,20 +112,31 @@ void VcxProjectGenerator::Worker::main()
 				else
 					others.push_back(file);
 			}
+		}
+
+	if(!build_info.incpath.empty())
+	{
+		IO::print(out, "\t<PropertyGroup>\n");
+		string path_str;
+		for(const FS::Path &p: build_info.incpath)
+			append(path_str, ";", p.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)
-		IO::print(out, "\t\t<ClCompile Include=\"%s\" />\n", (*i)->get_path());
+	for(const FileTarget *s: sources)
+		IO::print(out, "\t\t<ClCompile Include=\"%s\" />\n", s->get_path());
 	IO::print(out, "\t</ItemGroup>\n");
 
 	IO::print(out, "\t<ItemGroup>\n");
-	for(vector<const FileTarget *>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
-		IO::print(out, "\t\t<ClInclude Include=\"%s\" />\n", (*i)->get_path());
+	for(const FileTarget *i: includes)
+		IO::print(out, "\t\t<ClInclude Include=\"%s\" />\n", i->get_path());
 	IO::print(out, "\t</ItemGroup>\n");
 
 	IO::print(out, "\t<ItemGroup>\n");
-	for(vector<const FileTarget *>::const_iterator i=others.begin(); i!=others.end(); ++i)
-		IO::print(out, "\t\t<None Include=\"%s\" />\n", (*i)->get_path());
+	for(const FileTarget *t: others)
+		IO::print(out, "\t\t<None Include=\"%s\" />\n", t->get_path());
 	IO::print(out, "\t</ItemGroup>\n");
 
 	IO::print(out, "\t<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.targets\" />\n");