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

makefiles: Always explicitly specify the C runtime import. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-04-02 11:30:23 +02:00
parent fbbad0f10a
commit e67ca92f57
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/makedep.c
View File

@ -2236,7 +2236,6 @@ static struct strarray get_default_imports( const struct makefile *make )
struct strarray ret = empty_strarray; struct strarray ret = empty_strarray;
if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret;
if (make->use_msvcrt) strarray_add( &ret, "msvcrt" );
strarray_add( &ret, "winecrt0" ); strarray_add( &ret, "winecrt0" );
if (make->is_win16) strarray_add( &ret, "kernel" ); if (make->is_win16) strarray_add( &ret, "kernel" );
strarray_add( &ret, "kernel32" ); strarray_add( &ret, "kernel32" );
@ -4270,12 +4269,8 @@ static void load_sources( struct makefile *make )
} }
if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" ))
{ {
if (make->use_msvcrt && !make->testdll && !make->staticlib) crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt";
{ strarray_add( &make->imports, crt_dll );
strarray_add( &make->imports, "ucrtbase" );
crt_dll = "ucrtbase";
}
else crt_dll = "msvcrt";
} }
if (crt_dll && !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" );
} }
@ -4289,7 +4284,6 @@ static void load_sources( struct makefile *make )
{ {
for (i = 0; i < make->imports.count; i++) for (i = 0; i < make->imports.count; i++)
strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); strarray_add_uniq( &cross_import_libs, make->imports.str[i] );
if (crt_dll) strarray_add_uniq( &cross_import_libs, crt_dll );
if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" );
strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "winecrt0" );
strarray_add_uniq( &cross_import_libs, "kernel32" ); strarray_add_uniq( &cross_import_libs, "kernel32" );