#include "builder.h"
#include "component.h"
#include "executable.h"
+#include "exportdefinitions.h"
#include "externaltask.h"
#include "gnucompiler.h"
#include "gnulinker.h"
+#include "importlibrary.h"
#include "installedfile.h"
#include "objectfile.h"
#include "sharedlibrary.h"
const Component &comp = *objs.front()->get_component();
Binary *bin = 0;
if(arg=="shared")
- bin = new SharedLibrary(builder, comp, objs);
+ {
+ SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
+ if(architecture->get_system()=="windows")
+ {
+ const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
+ dlltool.create_target(*shlib);
+ }
+ bin = shlib;
+ }
else
bin = new Executable(builder, comp, objs);
bin->set_tool(*linker);
{
const Tool © = builder.get_toolchain().get_tool("CP");
InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
- const Pattern &pattern = architecture->get_shared_library_patterns().front();
- inst_tgt->set_symlink(pattern.apply(shlib->get_libname()));
+ if(architecture->get_system()=="windows")
+ builder.add_installed_target(*shlib->get_import_library());
+ else
+ {
+ const Pattern &pattern = architecture->get_shared_library_patterns().front();
+ string link_name = pattern.apply(shlib->get_libname());
+ if(link_name!=FS::basename(inst_tgt->get_path()))
+ inst_tgt->set_symlink(link_name);
+ }
return inst_tgt;
}
else
const Component &comp = *bin.get_component();
+ FS::Path work_dir = comp.get_package().get_source_directory();
+
if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
{
argv.push_back("-shared");
argv.push_back("-fPIC");
- if(!shlib->get_soname().empty())
+ if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
argv.push_back("-Wl,-soname,"+shlib->get_soname());
}
if(architecture->get_bits()!=native_arch.get_bits())
argv.push_back(format("-m%d", architecture->get_bits()));
- FS::Path work_dir = comp.get_package().get_source_directory();
-
argv.push_back("-o");
argv.push_back(relative(bin.get_path(), work_dir).str());
argv.push_back("-l"+shlib->get_libname());
static_link_ok = false;
}
+ else if(ImportLibrary *imp = dynamic_cast<ImportLibrary *>(tgt))
+ {
+ shlib = imp->get_shared_library();
+ if(shlib)
+ argv.push_back("-l"+shlib->get_libname());
+ else
+ argv.push_back(imp->get_path().str());
+ static_link_ok = false;
+ }
}
if(static_link_ok)