X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcomponent.cpp;h=11d2925d83514ce4849f08fcff0bf6a9d92c8f9e;hb=58a28fb253292942e042288f1a621b64e0c2ca90;hp=c4908c99a4986f9a0beeec2a8f78acbfd15c7c5e;hpb=50be4619cca4bb44e5abf8759720c255ef6d3b45;p=builder.git diff --git a/source/component.cpp b/source/component.cpp index c4908c9..11d2925 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -61,9 +61,9 @@ void Component::create_build_info() build_info.update_from(pkg.get_build_info()); - for(StringList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) + for(BuildInfo::PathList::iterator i=build_info.incpath.begin(); i!=build_info.incpath.end(); ++i) *i = (pkg.get_source() / *i).str(); - for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) + for(BuildInfo::PathList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i) *i = (pkg.get_source() / *i).str(); if(pkg.get_library_mode()!=DYNAMIC) @@ -273,7 +273,7 @@ void Component::Loader::source(const string &s) void Component::Loader::require(const string &n) { - Package *req = comp.pkg.get_builder().get_package(n); + Package *req = comp.pkg.get_builder().get_package_manager().find_package(n); if(req) comp.requires.push_back(req); }