Skip to content

W
wine-winehq
Commit 9576fbef authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makedep: Add the default Unix libraries also when building .dll.so files.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54096
parent 7acd3aa4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
tools/makedep.c
View file @ 9576fbef
...@@ -3079,6 +3079,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, ...@@ -3079,6 +3079,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source,
all_libs = dep_libs = empty_strarray; all_libs = dep_libs = empty_strarray;
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ) );
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) );
if (!arch) strarray_addall( &all_libs, libs );
dll_name = arch_module_name( strmake( "%s.dll", obj ), arch ); dll_name = arch_module_name( strmake( "%s.dll", obj ), arch );
obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj )); obj_name = obj_dir_path( make, strmake( "%s%s.o", arch_dirs[arch], obj ));
res_name = strmake( "%s%s.res", arch_dirs[arch], obj ); res_name = strmake( "%s%s.res", arch_dirs[arch], obj );
...@@ -3319,6 +3320,7 @@ static void output_module( struct makefile *make, unsigned int arch ) ...@@ -3319,6 +3320,7 @@ static void output_module( struct makefile *make, unsigned int arch )
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, imports, IMPORT_TYPE_DIRECT, arch ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, arch )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, IMPORT_TYPE_DELAYED, arch ));
strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) ); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, default_imports, IMPORT_TYPE_DEFAULT, arch ) );
if (!arch) strarray_addall( &all_libs, libs );
if (delay_load_flags[arch]) if (delay_load_flags[arch])
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment