Module: wine Branch: master Commit: 62807be8c9a7620e7198b203f5d56046a87584ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=62807be8c9a7620e7198b203f...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Apr 21 12:00:08 2020 +0200
makefiles: Explicitly import libwine where necessary.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/Makefile.in | 2 +- dlls/wineandroid.drv/Makefile.in | 1 + tools/winegcc/winegcc.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 491cf5a707..a67809a6c2 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) +EXTRALIBS = -lwine $(IOKIT_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
C_SRCS = \ diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 40ab495e35..e35f85ac89 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,5 +1,6 @@ MODULE = wineandroid.drv IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl +EXTRALIBS = -lwine
C_SRCS = \ device.c \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5ea99d3cf0..d38ca97488 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1180,7 +1180,6 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "kernel32"); add_library(opts, lib_dirs, files, "ntdll"); } - if (!opts->nostdlib && !is_pe) add_library(opts, lib_dirs, files, "wine");
/* set default entry point, if needed */ if (!opts->entry_point)