X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfiggenerator.cpp;h=91d101da440cc4aee56358ba6f81674f8cdf86d1;hb=4922c91ca3a3a040b2a1a18ea41642c6542a838c;hp=708a9130ed63e6c158df084dbba9b01ae29b2369;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 708a913..91d101d 100644
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -28,9 +28,7 @@ Task *PkgConfigGenerator::run(const Target &target) const
 
 PkgConfigGenerator::Worker::Worker(const PkgConfig &t):
 	target(t)
-{
-	launch();
-}
+{ }
 
 void PkgConfigGenerator::Worker::main()
 {
@@ -58,16 +56,19 @@ 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');
+
+	status = Task::SUCCESS;
 }