X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvcxprojectgenerator.cpp;h=a173829941da9bb0adc18bb2ac103dea9625d354;hb=a557d2ba9aae4a05e4b15c81ba5262da7caac2a5;hp=3f806a091e8d19a043fd3d00bc3614bf7814977f;hpb=70325e0d3996adb97b99d45445a34c9334566803;p=builder.git
diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index 3f806a0..a173829 100644
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -57,6 +57,7 @@ void VcxProjectGenerator::Worker::main()
IO::print(out, "\t\n");
IO::print(out, "\t\t15.0\n");
IO::print(out, "\t\tMakeFileProj\n");
+ IO::print(out, "\t\t{%s}\n", target.get_guid());
IO::print(out, "\t\n");
IO::print(out, "\t\n");
@@ -69,10 +70,11 @@ void VcxProjectGenerator::Worker::main()
exe = dynamic_cast(*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::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\n", *j, *i);
IO::print(out, "\t\tMakeFile\n");
IO::print(out, "\t\t%s\n", base_cmd);
@@ -80,7 +82,6 @@ void VcxProjectGenerator::Worker::main()
IO::print(out, "\t\t%s -B\n", base_cmd);
if(exe)
IO::print(out, "\t\t%s\n", exe->get_path());
- IO::print(out, "\t\t\tv142\n");
IO::print(out, "\t\n");
}
@@ -90,9 +91,17 @@ void VcxProjectGenerator::Worker::main()
vector sources;
vector includes;
vector 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(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(i->second))
{
if(dynamic_cast(file))
{
@@ -105,6 +114,17 @@ void VcxProjectGenerator::Worker::main()
else
others.push_back(file);
}
+ }
+
+ if(!build_info.incpath.empty())
+ {
+ IO::print(out, "\t\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%s\n", path_str);
+ IO::print(out, "\t\n");
+ }
IO::print(out, "\t\n");
for(vector::const_iterator i=sources.begin(); i!=sources.end(); ++i)