X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=21b765bd25f4ef41b139beaa06f3c58671252581;hb=50baabc242633d531d3f9542e9a64491b6e12c6c;hp=92971da7b15a6de11c0e7cc0060cc0daefdcb08b;hpb=c009620591a7e80c457eabe3a2dbfc2dcfbdf5cf;p=builder.git

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 92971da..21b765b 100644
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -7,9 +7,11 @@
 #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"
@@ -68,7 +70,15 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
 	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);
@@ -81,8 +91,15 @@ Target *GnuLinker::create_install(Target &target) const
 	{
 		const Tool &copy = 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.get_build_graph().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
@@ -150,11 +167,13 @@ Task *GnuLinker::Linker::run(const Target &target) const
 
 	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());
 	}
 
@@ -170,8 +189,6 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	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());
 
@@ -180,17 +197,27 @@ Task *GnuLinker::Linker::run(const Target &target) const
 	const Target::Dependencies &depends = target.get_dependencies();
 	for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
+		FileTarget *file = dynamic_cast<FileTarget *>(*i);
 		Target *tgt = (*i)->get_real_target();
 
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
 		else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
-			argv.push_back(stlib->get_path().str());
+			argv.push_back((file?file:stlib)->get_path().str());
 		else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
 		{
 			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((file?file:imp)->get_path().str());
+			static_link_ok = false;
+		}
 	}
 
 	if(static_link_ok)