X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvcxprojectgenerator.cpp;h=871cde9f9eebfdf4bcc8825c67b5526abf6bfbb5;hb=f0a97cb158bef2656bbb8e1dafe072af7ff9c596;hp=52451f59d939c51b62796294341ee63223ab6b64;hpb=9dd42116ce72f8b2288ab535f89242f87a44337a;p=builder.git
diff --git a/source/vcxprojectgenerator.cpp b/source/vcxprojectgenerator.cpp
index 52451f5..871cde9 100644
--- a/source/vcxprojectgenerator.cpp
+++ b/source/vcxprojectgenerator.cpp
@@ -81,7 +81,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");
}
@@ -91,9 +90,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))
{
@@ -106,6 +113,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)