[PATCH] makedep: Set use_msvcrt for ucrtbase imports as well

Martin Storsjo martin at martin.st
Wed Nov 4 04:21:58 CST 2015


This is required if e.g. msvcp140 would link to ucrtbase.

Signed-off-by: Martin Storsjo <martin at martin.st>
---
 tools/makedep.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index d2d39a6..9299bdf 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2890,7 +2890,8 @@ static void update_makefile( const char *path )
     make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" );
 
     for (i = 0; i < make->imports.count && !make->use_msvcrt; i++)
-        make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 );
+        make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) ||
+                           !strcmp( make->imports.str[i], "ucrtbase" );
 
     make->install_lib_rules = empty_strarray;
     make->install_dev_rules = empty_strarray;
-- 
1.8.1.2




More information about the wine-patches mailing list