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

makefiles: Explicitly import the CRT library also for test dlls. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-09-10 22:05:00 +02:00
parent 655ab7a84f
commit 5d2596ad8a
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tools/makedep.c
View File

@ -2294,6 +2294,29 @@ static struct strarray get_default_imports( const struct makefile *make )
} }
/*******************************************************************
* add_crt_import
*/
static const char *add_crt_import( const struct makefile *make, struct strarray *imports )
{
unsigned int i;
const char *crt_dll = NULL;
for (i = 0; i < imports->count; i++)
{
if (strncmp( imports->str[i], "msvcr", 5 ) && strncmp( imports->str[i], "ucrt", 4 )) continue;
if (crt_dll) fatal_error( "More than one C runtime DLL imported: %s and %s\n", crt_dll, imports->str[i] );
crt_dll = imports->str[i];
}
if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" ))
{
crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt";
strarray_add( imports, crt_dll );
}
return crt_dll;
}
/******************************************************************* /*******************************************************************
* add_install_rule * add_install_rule
*/ */
@ -3041,6 +3064,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source,
const char *debug_file; const char *debug_file;
if (!imports.count) imports = make->imports; if (!imports.count) imports = make->imports;
else if (make->use_msvcrt) add_crt_import( make, &imports );
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, 0 ); all_libs = add_import_libs( make, &dep_libs, imports, 0, 0 );
add_import_libs( make, &dep_libs, get_default_imports( make ), 0, 0 ); /* dependencies only */ add_import_libs( make, &dep_libs, get_default_imports( make ), 0, 0 ); /* dependencies only */
@ -4248,7 +4273,7 @@ static void load_sources( struct makefile *make )
"MANPAGES", "MANPAGES",
NULL NULL
}; };
const char **var, *crt_dll = NULL; const char **var;
unsigned int i; unsigned int i;
struct strarray value; struct strarray value;
struct incl_file *file; struct incl_file *file;
@ -4338,21 +4363,16 @@ static void load_sources( struct makefile *make )
if (make->use_msvcrt) if (make->use_msvcrt)
{ {
unsigned int msvcrt_version = 0; const char *crt_dll = add_crt_import( make, &make->imports );
for (i = 0; i < make->imports.count; i++)
{
if (strncmp( make->imports.str[i], "msvcr", 5 ) && strncmp( make->imports.str[i], "ucrt", 4 )) continue;
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];
sscanf( crt_dll, "msvcr%u", &msvcrt_version );
}
if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" ))
{
crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt";
strarray_add( &make->imports, crt_dll );
}
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" );
else strarray_add( &make->define_args, strmake( "-D_MSVCR_VER=%u", msvcrt_version )); else
{
unsigned int msvcrt_version = 0;
if (crt_dll) sscanf( crt_dll, "msvcr%u", &msvcrt_version );
strarray_add( &make->define_args, strmake( "-D_MSVCR_VER=%u", msvcrt_version ));
}
} }
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 );