Alexandre Julliard : makedep: Pass the actual name of the module in the delay load flags.
Module: wine Branch: master Commit: 020e2b6bb46b3bc39d2088d6ff668e64b2576aae URL: https://gitlab.winehq.org/wine/wine/-/commit/020e2b6bb46b3bc39d2088d6ff668e6... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 17:50:43 2022 +0100 makedep: Pass the actual name of the module in the delay load flags. --- tools/makedep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a3a665cc84a..893808930fb 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3323,8 +3323,10 @@ static void output_module( struct makefile *make, unsigned int arch ) if (delay_load_flags[arch]) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "%s%s%s", delay_load_flags[arch], make->delayimports.str[i], - strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); + { + struct makefile *import = get_static_lib( make->delayimports.str[i], arch ); + if (import) strarray_add( &all_libs, strmake( "%s%s", delay_load_flags[arch], import->module )); + } } } else module_name = strmake( "%s%s", arch_pe_dirs[arch], make->module );
participants (1)
-
Alexandre Julliard