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);
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");
}
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))
{
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)