From e64433e6b1cf01fdfcf8e468e735c090a957253b Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 2 Jan 2023 12:33:19 +0200 Subject: [PATCH] Remove ExportDefinitions from ImportLibrary's constructor It's not necessary with the MSVC toolchain. --- plugins/gnu/mingwdlltool.cpp | 3 ++- source/lib/importlibrary.cpp | 3 +-- source/lib/importlibrary.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/gnu/mingwdlltool.cpp b/plugins/gnu/mingwdlltool.cpp index c5ffdf5..e93edc3 100644 --- a/plugins/gnu/mingwdlltool.cpp +++ b/plugins/gnu/mingwdlltool.cpp @@ -37,7 +37,8 @@ Target *MingwDllTool::create_target(const vector &sources, const strin ExportDefinitions *exp = new ExportDefinitions(builder, *shlib.get_component(), objs); exp->set_tool(*this); - ImportLibrary *imp = new ImportLibrary(builder, *shlib.get_component(), shlib, *exp); + ImportLibrary *imp = new ImportLibrary(builder, *shlib.get_component(), shlib); + imp->add_dependency(*exp); imp->set_tool(*this); return imp; diff --git a/source/lib/importlibrary.cpp b/source/lib/importlibrary.cpp index 435fb30..190b079 100644 --- a/source/lib/importlibrary.cpp +++ b/source/lib/importlibrary.cpp @@ -10,12 +10,11 @@ using namespace std; using namespace Msp; -ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl, ExportDefinitions &exp): +ImportLibrary::ImportLibrary(Builder &b, const Component &c, SharedLibrary &sl): FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c, sl)), shared_lib(&sl) { component = &c; - add_dependency(exp); shared_lib->set_import_library(this); install_location = "lib"; diff --git a/source/lib/importlibrary.h b/source/lib/importlibrary.h index 1c5d682..ac2de26 100644 --- a/source/lib/importlibrary.h +++ b/source/lib/importlibrary.h @@ -17,7 +17,7 @@ private: public: ImportLibrary(Builder &b, const Msp::FS::Path &p): FileTarget(b, p) { } - ImportLibrary(Builder &, const Component &, SharedLibrary &, ExportDefinitions &); + ImportLibrary(Builder &, const Component &, SharedLibrary &); private: static std::string generate_filename(const Component &, const SharedLibrary &); -- 2.45.2