ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Don't add default libs for msvcrt builds. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-04-02 11:31:33 +02:00
parent e67ca92f57
commit 5603ece70d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/makedep.c
View File

@ -2148,9 +2148,12 @@ static struct strarray add_default_libraries( const struct makefile *make, struc
struct strarray all_libs = empty_strarray; struct strarray all_libs = empty_strarray;
unsigned int i, j; unsigned int i, j;
if (!make->use_msvcrt) strarray_add( &all_libs, "-lwine_port" ); if (!make->use_msvcrt)
{
strarray_add( &all_libs, "-lwine_port" );
strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" )); strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" ));
strarray_addall( &all_libs, libs ); strarray_addall( &all_libs, libs );
}
for (i = 0; i < all_libs.count; i++) for (i = 0; i < all_libs.count; i++)
{ {
@ -2999,7 +3002,6 @@ static void output_source_spec( struct makefile *make, struct incl_file *source,
if (!dll_flags.count) dll_flags = make->extradllflags; if (!dll_flags.count) dll_flags = make->extradllflags;
all_libs = add_import_libs( make, &dep_libs, imports, 0 ); all_libs = add_import_libs( make, &dep_libs, imports, 0 );
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
strarray_addall( &all_libs, libs );
dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext ); dll_name = strmake( "%s.dll%s", obj, make->is_cross ? "" : dll_ext );
obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" ); obj_name = strmake( "%s%s", obj_dir_path( make, obj ), make->is_cross ? ".cross.o" : ".o" );
@ -3446,7 +3448,6 @@ static void output_test_module( struct makefile *make )
const char *parent_ext = parent && parent->is_cross ? "" : dll_ext; const char *parent_ext = parent && parent->is_cross ? "" : dll_ext;
add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */
strarray_addall( &all_libs, libs );
strarray_add( &make->all_targets, strmake( "%s%s", testmodule, ext )); strarray_add( &make->all_targets, strmake( "%s%s", testmodule, ext ));
strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext ));
output( "%s%s:\n", obj_dir_path( make, testmodule ), ext ); output( "%s%s:\n", obj_dir_path( make, testmodule ), ext );