#include <msp/strings/lexicalcast.h>
#include "builder.h"
#include "component.h"
+#include "csourcefile.h"
#include "datafile.h"
#include "executable.h"
#include "file.h"
#include "objectfile.h"
#include "sharedlibrary.h"
-#include "sourcefile.h"
#include "sourcepackage.h"
#include "staticlibrary.h"
#include "tarball.h"
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)
if(type==PROGRAM)
build_info.strip = lexical_cast<bool>(pkg.get_config().get_option("strip").value);
-
- build_info.unique();
}
void Component::create_targets() const
{
FileTarget *hdr = builder.get_vfs().get_target(*i);
if(!hdr)
- hdr = new SourceFile(builder, *this, *i);
+ hdr = new CSourceFile(builder, *this, *i);
// Install headers if requested
if(type==HEADERS && install)
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);
}