makefiles: Explicitly import libwine where necessary.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
f6a363bc41
commit
62807be8c9
|
@ -3,7 +3,7 @@ MODULE = ntdll.dll
|
||||||
IMPORTLIB = ntdll
|
IMPORTLIB = ntdll
|
||||||
IMPORTS = winecrt0
|
IMPORTS = winecrt0
|
||||||
EXTRAINCL = $(UNWIND_CFLAGS)
|
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
|
EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
MODULE = wineandroid.drv
|
MODULE = wineandroid.drv
|
||||||
IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl
|
IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl
|
||||||
|
EXTRALIBS = -lwine
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
device.c \
|
device.c \
|
||||||
|
|
|
@ -1180,7 +1180,6 @@ static void build(struct options* opts)
|
||||||
add_library(opts, lib_dirs, files, "kernel32");
|
add_library(opts, lib_dirs, files, "kernel32");
|
||||||
add_library(opts, lib_dirs, files, "ntdll");
|
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 */
|
/* set default entry point, if needed */
|
||||||
if (!opts->entry_point)
|
if (!opts->entry_point)
|
||||||
|
|
Loading…
Reference in New Issue