widl: Fix including tlb files in mingw-w64-tools configuration.

Prior to c94f44f9 (widl: Search for imported typelibs in the library search path.), widl looked for tlb files in the path specified by BIN_TO_INCLUDEDIR. After that commit, widl looks for tlb files in a subdirectory (get_pe_dir) of BIN_TO_DLLDIR (which mingw-w64 sets to the same as BIN_TO_INCLUDEDIR). For compatibility with the mingw-w64 usecase, check for tlb files in the directory specified by BIN_TO_DLLDIR without a separate subdirectory suffix too. Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Fix including tlb files in mingw-w64-tools configuration.
7f95c692 · Martin Storsjö · Alexandre Julliard · 25e1fcc5 · 7f95c692
Commit 7f95c692 authored Dec 29, 2021 by Martin Storsjö Committed by Alexandre Julliard Dec 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

widl.c tools/widl/widl.c +5 -1

No files found.
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -698,7 +698,11 @@ int open_typelib( const char *name )

    if (stdinc)
    {
-        if (dlldir) TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name ));
+        if (dlldir)
+        {
+            TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name ));
+            TRYOPEN( strmake( "%s/%s", dlldir, name ));
+        }
        for (i = 0; i < ARRAY_SIZE(default_dirs); i++)
        {
            if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue;