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

makedep: Build builtin DLLs with ucrtbase. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-03-20 14:36:37 +01:00 committed by Alexandre Julliard
parent 14df0183b0
commit 05b774fb48
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/makedep.c
View File

@ -4268,16 +4268,16 @@ static void load_sources( struct makefile *make )
if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] );
crt_dll = make->imports.str[i]; crt_dll = make->imports.str[i];
} }
if (!crt_dll) if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" ))
{ {
if (make->use_msvcrt && make->is_exe) if (make->use_msvcrt && !make->testdll && !make->staticlib)
{ {
strarray_add( &make->imports, "ucrtbase" ); strarray_add( &make->imports, "ucrtbase" );
crt_dll = "ucrtbase"; crt_dll = "ucrtbase";
} }
else crt_dll = "msvcrt"; else crt_dll = "msvcrt";
} }
if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" );
} }
LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 );