X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfiggenerator.cpp;h=141b363cda3d348692d93887cf335a84e9873d93;hb=1a75d7e01d0704f83633f696a312744de272b4c4;hp=827f62d4cff20ec108aab4ebc9e439f8abee1b61;hpb=811a840948aab4e2f4a423d481f076220372a998;p=builder.git diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp index 827f62d..141b363 100644 --- a/source/pkgconfiggenerator.cpp +++ b/source/pkgconfiggenerator.cpp @@ -33,7 +33,7 @@ PkgConfigGenerator::Worker::Worker(const PkgConfigFile &t): void PkgConfigGenerator::Worker::main() { Builder &builder = target.get_package()->get_builder(); - const SourcePackage &spkg = dynamic_cast(*target.get_package()); + const SourcePackage &spkg = *target.get_package(); IO::BufferedFile out(target.get_path().str(), IO::M_WRITE); IO::print(out, "prefix=%s\n", builder.get_prefix().str()); @@ -52,16 +52,16 @@ void PkgConfigGenerator::Worker::main() const BuildInfo &binfo = spkg.get_exported_binfo(); IO::print(out, "Libs:"); - for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i) + for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i) 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) + for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i) IO::print(out, " -l%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) + for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i) IO::print(out, " -I%s", FS::relative(*i, builder.get_prefix()).str()); for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i) if(i->second.empty())