X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfiggenerator.cpp;fp=source%2Fpkgconfiggenerator.cpp;h=555d8c56db797bc5fda9e2e72842bcea4726fc51;hb=45c778b1976de1a3093e0c6fb5e2a94c42073dcb;hp=708a9130ed63e6c158df084dbba9b01ae29b2369;hpb=dcaf06c2bba4e02a312cd6af24ddc96410e7be4e;p=builder.git

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 708a913..555d8c5 100644
--- 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');
 }