X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fimportlibrary.cpp;h=1e6650fdac1ee648ebae4fbf642ef2cf498a1c6e;hb=ec7da8076eede6c47126c8e58e478b9c93d73f5f;hp=9ac441f419ea6d683eb86c07890f622232711084;hpb=82ae60a647ebb9567f7177c353245f4d72faaf5e;p=builder.git

diff --git a/source/importlibrary.cpp b/source/importlibrary.cpp
index 9ac441f..1e6650f 100644
--- a/source/importlibrary.cpp
+++ b/source/importlibrary.cpp
@@ -2,6 +2,7 @@
 #include "component.h"
 #include "exportdefinitions.h"
 #include "importlibrary.h"
+#include "sharedlibrary.h"
 #include "sourcepackage.h"
 
 using namespace std;
@@ -12,16 +13,17 @@ ImportLibrary::ImportLibrary(Builder &b, const FS::Path &p):
 	shared_lib(0)
 { }
 
-ImportLibrary::ImportLibrary(Builder &b, const Component &c, ExportDefinitions &exp):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/format("lib%s.dll.a", c.get_name())),
-	shared_lib(&exp.get_library())
+ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl, ExportDefinitions &exp):
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/format("lib%s.dll.a", sl.get_libname())),
+	shared_lib(&sl)
 {
 	component = &c;
 	add_dependency(exp);
+	shared_lib->set_import_library(this);
 
 	install_location = "lib";
 
 	const string &version = component->get_package().get_interface_version();
 	if(!version.empty())
-		install_filename = format("lib%s-%s.dll.a", c.get_name(), version);
+		install_filename = format("lib%s-%s.dll.a", sl.get_libname(), version);
 }