#include <cstdlib>
#include <msp/fs/utils.h>
#include <msp/strings/format.h>
-#include "architecture.h"
#include "builder.h"
#include "component.h"
#include "exportdefinitions.h"
MingwDllTool::MingwDllTool(Builder &b, const Architecture &a):
Tool(b, a, "DLL")
{
- string command = "dlltool";
- if(architecture->is_cross())
- command = format("%s-%s", architecture->get_cross_prefix(), command);
- executable = builder.get_vfs().find_binary(command);
+ set_command("dlltool", true);
}
-Target *MingwDllTool::create_target(const list<Target *> &sources, const string &) const
+Target *MingwDllTool::create_target(const list<Target *> &sources, const string &)
{
if(sources.size()!=1)
throw invalid_argument("MingwDllTool::create_target");
SharedLibrary &shlib = dynamic_cast<SharedLibrary &>(*sources.front());
list<ObjectFile *> objs;
- const Target::Dependencies &depends = shlib.get_dependencies();
- for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
- if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+ for(Target *d: shlib.get_dependencies())
+ if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
objs.push_back(obj);
ExportDefinitions *exp = new ExportDefinitions(builder, *shlib.get_component(), objs);
{
if(ImportLibrary *imp = dynamic_cast<ImportLibrary *>(&target))
{
- const Tool © = builder.get_toolchain().get_tool("CP");
+ Tool © = builder.get_toolchain().get_tool("CP");
InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
string link_name = format("lib%s.dll.a", imp->get_shared_library()->get_libname());
if(link_name!=FS::basename(inst_tgt->get_path()))
}
else
{
- const Target::Dependencies &depends = exp->get_dependencies();
- for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
- {
- if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+ for(Target *d: exp->get_dependencies())
+ if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
argv.push_back(relative(obj->get_path(), work_dir).str());
- }
// XXX Should use dllexport, but that has some other problems to solve
argv.push_back("--export-all-symbols");