Skip to content
Snippets Groups Projects
Commit 7f95c692 authored by Martin Storsjö's avatar Martin Storsjö Committed by Alexandre Julliard
Browse files

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: default avatarMartin Storsjö <martin@martin.st>
Signed-off-by: Alexandre Julliard's avatarAlexandre Julliard <julliard@winehq.org>
parent 25e1fcc5
No related branches found
No related tags found
No related merge requests found
...@@ -698,7 +698,11 @@ int open_typelib( const char *name ) ...@@ -698,7 +698,11 @@ int open_typelib( const char *name )
if (stdinc) 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++) for (i = 0; i < ARRAY_SIZE(default_dirs); i++)
{ {
if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue; if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment