Jacek Caban : makedep: Define _UCRT in modules that link to ucrtbase.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 229c33791f0a4690f01550d7138b038d52f17f7c
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=229c33791f0a4690f01550d7138b038d52f17f7c

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Feb 18 15:21:13 2020 +0100

makedep: Define _UCRT in modules that link to ucrtbase.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/makedep.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 1e33b1c673..6dec1b3900 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -4172,7 +4172,7 @@ static void load_sources( struct makefile *make )
         "MANPAGES",
         NULL
     };
-    const char **var;
+    const char **var, *crt_dll = NULL;
     unsigned int i;
     struct strarray value;
     struct incl_file *file;
@@ -4265,11 +4265,23 @@ static void load_sources( struct makefile *make )
 
     make->is_cross = crosstarget && make->use_msvcrt;
 
+    if (make->use_msvcrt)
+    {
+        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];
+        }
+        if (!crt_dll) crt_dll = "msvcrt";
+        if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" );
+    }
+
     if (make->is_cross)
     {
         for (i = 0; i < make->imports.count; i++)
             strarray_add_uniq( &cross_import_libs, make->imports.str[i] );
-        if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" );
+        if (crt_dll) strarray_add_uniq( &cross_import_libs, crt_dll );
         if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" );
         strarray_add_uniq( &cross_import_libs, "winecrt0" );
         strarray_add_uniq( &cross_import_libs, "kernel32" );