X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfiggenerator.cpp;h=811fa5d2ef68e9e6bfdb9ef3d04a6c88ac2f4950;hb=0c1b2a50c95d9bb981b36d3ce522c7094ec5fe0a;hp=827f62d4cff20ec108aab4ebc9e439f8abee1b61;hpb=811a840948aab4e2f4a423d481f076220372a998;p=builder.git

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 827f62d..811fa5d 100644
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -33,35 +33,35 @@ PkgConfigGenerator::Worker::Worker(const PkgConfigFile &t):
 void PkgConfigGenerator::Worker::main()
 {
 	Builder &builder = target.get_package()->get_builder();
-	const SourcePackage &spkg = dynamic_cast<const SourcePackage &>(*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());
-	IO::print(out, "source=%s\n\n", spkg.get_source());
+	IO::print(out, "source=%s\n\n", spkg.get_source_directory());
 
 	IO::print(out, "Name: %s\n", spkg.get_name());
 	IO::print(out, "Description: %s\n", spkg.get_description());
 	IO::print(out, "Version: %s\n", spkg.get_version());
 
 	IO::print(out, "Requires:");
-	const PackageList &reqs = spkg.get_requires();
+	const PackageList &reqs = spkg.get_required_packages();
 	for(PackageList::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
 		if((*i)->get_use_pkgconfig())
 			IO::print(out, " %s", (*i)->get_name());
 	out.put('\n');
 
-	const BuildInfo &binfo = spkg.get_exported_binfo();
+	const BuildInfo &binfo = spkg.get_exported_build_info();
 	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())