zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-21 17:09:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

makefiles: Also build import libs for extra test modules.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-06-12 19:40:25 +02:00
parent b531e51cd7
commit c873db8c1d
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/makedep.c
View file

@ -183,6 +183,7 @@ struct makefile
struct strarray install_lib;
struct strarray install_dev;
struct strarray extra_targets;
struct strarray extra_imports;
struct list sources;
struct list includes;
const char *base_dir;
@ -1958,6 +1959,12 @@ static void add_generated_sources( struct makefile *make )
if (!make->disabled)
strarray_add_uniq( &linguas, replace_extension( source->name, ".po", "" ));
}
if (strendswith( source->name, ".spec" ))
{
char *obj = replace_extension( source->name, ".spec", "" );
strarray_addall_uniq( &make->extra_imports,
get_expanded_file_local_var( make, obj, "IMPORTS" ));
}
}
if (make->testdll)
{
@ -4361,8 +4368,8 @@ static void load_sources( struct makefile *make )
if (make->is_cross)
{
for (i = 0; i < make->imports.count; i++)
strarray_add_uniq( &cross_import_libs, make->imports.str[i] );
strarray_addall_uniq( &cross_import_libs, make->imports );
strarray_addall_uniq( &cross_import_libs, make->extra_imports );
if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" );
strarray_add_uniq( &cross_import_libs, "winecrt0" );
strarray_add_uniq( &cross_import_libs, "kernel32" );