makedep: Link with imported libs before delay imported libs.

In order to favor direct imports over delayed imports, for instance when the delay imported module forwards symbols from the imported module.

makedep: Link with imported libs before delay imported libs.
c90e03e3 · Rémi Bernon · Alexandre Julliard · 214223ed · c90e03e3
Commit c90e03e3 authored Sep 29, 2022 by Rémi Bernon Committed by Alexandre Julliard Sep 30, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

makedep.c tools/makedep.c +1 -1

No files found.
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -3176,8 +3176,8 @@ static void output_module( struct makefile *make )

        if (!strarray_exists( &make->extradllflags, "-nodefaultlibs" )) default_imports = get_default_imports( make, imports );

-        strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross ));
        strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, make->is_cross ));
+        strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, make->is_cross ));
        strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, make->is_cross ) );

        if (!make->use_msvcrt)