X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarypackage.cpp;h=514481f0066c56a3febb253a81708d3ff51c16da;hb=8818c970f123a7fa44bf41bc60369217d083b4da;hp=8c3571d103ac4fb9cc955e7178d3a8b745d26d95;hpb=1d687970cc35e54c3335f4aa2fdef23424fe0a06;p=builder.git

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index 8c3571d..514481f 100644
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -20,16 +20,16 @@ void BinaryPackage::set_path(const FS::Path &p)
 
 void BinaryPackage::create_build_info()
 {
-	for(StringList::iterator i=export_binfo.incpath.begin(); i!=export_binfo.incpath.end(); ++i)
-		if((*i)[0]=='@')
-			*i = (path/i->substr(1)).str();
+	for(BuildInfo::PathList::iterator i=export_binfo.incpath.begin(); i!=export_binfo.incpath.end(); ++i)
+		if((*i)[0]=="@")
+			*i = path/i->subpath(1);
 
-	for(StringList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i)
-		if((*i)[0]=='@')
-			*i = (path/i->substr(1)).str();
+	for(BuildInfo::PathList::iterator i=export_binfo.libpath.begin(); i!=export_binfo.libpath.end(); ++i)
+		if((*i)[0]=="@")
+			*i = path/i->subpath(1);
 }
 
-BinaryPackage *BinaryPackage::from_flags(Builder &builder, const std::string &name, const vector<string> &flags)
+BinaryPackage *BinaryPackage::from_flags(Builder &builder, const string &name, const vector<string> &flags)
 {
 	BinaryPackage *pkg = new BinaryPackage(builder, name);
 	pkg->use_pkgconfig = true;
@@ -60,7 +60,7 @@ BinaryPackage *BinaryPackage::from_flags(Builder &builder, const std::string &na
 
 
 BinaryPackage::Loader::Loader(BinaryPackage &p):
-	Package::Loader(p)
+	DataFile::DerivedObjectLoader<BinaryPackage, Package>(p)
 {
 	add("need_path", &BinaryPackage::need_path);
 	add("build_info", &Loader::build_info);
@@ -68,5 +68,5 @@ BinaryPackage::Loader::Loader(BinaryPackage &p):
 
 void BinaryPackage::Loader::build_info()
 {
-	load_sub(static_cast<BinaryPackage &>(pkg).export_binfo);
+	load_sub(obj.export_binfo);
 }