system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 01:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Prior to c94f44f9b4 (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>
This commit is contained in:
Martin Storsjö 2021-12-29 00:05:07 +02:00 committed by Alexandre Julliard
parent 25e1fcc563
commit 7f95c69299
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tools/widl/widl.c
View file

@ -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;