Rewrite BuildInfo to be compiler-agnostic

[builder.git] / source / pkgconfiggenerator.cpp

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 708a9130ed63e6c158df084dbba9b01ae29b2369..555d8c56db797bc5fda9e2e72842bcea4726fc51 100644 (file)
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -58,16 +58,17 @@ void PkgConfigGenerator::Worker::main()
                IO::print(out, " -L%s", FS::relative(*i, builder.get_prefix()).str());
        for(StringList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                IO::print(out, " -l%s", *i);
-       for(StringList::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
-               IO::print(out, " %s", *i);
+       if(binfo.threads)
+               out.write("-pthread");
        out.put('\n');
 
        IO::print(out, "Cflags:");
        for(StringList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
                IO::print(out, " -I%s", FS::relative(*i, builder.get_prefix()).str());
-       for(StringList::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-               IO::print(out, " -D%s", *i);
-       for(StringList::const_iterator i=binfo.cflags.begin(); i!=binfo.cflags.end(); ++i)
-               IO::print(out, " %s", *i);
+       for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+               if(i->second.empty())
+                       IO::print(out, " -D%s", i->first);
+               else
+                       IO::print(out, " -D%s=%s", i->first, i->second);
        out.put('\n');
 }