From 2477aa7a1060837919a09da1ac0cd35ae06ea435 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 5 Aug 2019 18:57:47 +0200 Subject: [PATCH] makefiles: Default to an msvcrt build for static libraries. Signed-off-by: Alexandre Julliard --- dlls/strmbase/Makefile.in | 2 -- dlls/winecrt0/Makefile.in | 2 -- tools/makedep.c | 4 +++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/Makefile.in b/dlls/strmbase/Makefile.in index d22e986b9a0..c58a3591739 100644 --- a/dlls/strmbase/Makefile.in +++ b/dlls/strmbase/Makefile.in @@ -1,7 +1,5 @@ MODULE = libstrmbase.a -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ dispatch.c \ dllfunc.c \ diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6edbd049606..79ba92faeb7 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,7 +1,5 @@ MODULE = libwinecrt0.a -EXTRADLLFLAGS = -mno-cygwin - C_SRCS = \ debug.c \ delay_load.c \ diff --git a/tools/makedep.c b/tools/makedep.c index 24866b31455..e37bd8d63a9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4160,7 +4160,9 @@ static void load_sources( struct makefile *make ) make->extra_targets = get_expanded_make_var_array( make, "EXTRA_TARGETS" ); if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; - if (make->testdll) strarray_add( &make->extradllflags, "-mno-cygwin" ); + + if ((make->module && make->staticlib) || make->testdll) + strarray_add( &make->extradllflags, "-mno-cygwin" ); strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" )); make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir );