Moved the pthread emulation into the main binary so that we don't need
to link it against ntdll.
This commit is contained in:
parent
9194267814
commit
08a64e6e6a
|
@ -7,7 +7,6 @@ MODULE = ntdll.dll
|
||||||
EXTRALIBS = $(LIBUNICODE) @LIBPTHREAD@
|
EXTRALIBS = $(LIBUNICODE) @LIBPTHREAD@
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
$(TOPOBJDIR)/scheduler/pthread.c \
|
|
||||||
cdrom.c \
|
cdrom.c \
|
||||||
critsection.c \
|
critsection.c \
|
||||||
debugtools.c \
|
debugtools.c \
|
||||||
|
@ -50,8 +49,6 @@ EXTRA_OBJS = $(ASM_SRCS:.s=.o)
|
||||||
|
|
||||||
SUBDIRS = tests
|
SUBDIRS = tests
|
||||||
|
|
||||||
EXTRASUBDIRS = $(TOPOBJDIR)/scheduler
|
|
||||||
|
|
||||||
@MAKE_DLL_RULES@
|
@MAKE_DLL_RULES@
|
||||||
|
|
||||||
relay32.s: $(WINEBUILD)
|
relay32.s: $(WINEBUILD)
|
||||||
|
|
|
@ -5,16 +5,19 @@ VPATH = @srcdir@
|
||||||
MODULE = wine
|
MODULE = wine
|
||||||
|
|
||||||
C_SRCS = \
|
C_SRCS = \
|
||||||
|
$(TOPOBJDIR)/scheduler/pthread.c \
|
||||||
main.c
|
main.c
|
||||||
|
|
||||||
|
EXTRASUBDIRS = $(TOPOBJDIR)/scheduler
|
||||||
|
|
||||||
all: $(MODULE)
|
all: $(MODULE)
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
LDEXECFLAGS = @LDEXECFLAGS@
|
LDEXECFLAGS = @LDEXECFLAGS@
|
||||||
|
|
||||||
$(MODULE): $(OBJS) Makefile.in $(DLLDIR)/libntdll.dll.$(LIBEXT)
|
$(MODULE): $(OBJS) Makefile.in
|
||||||
$(CC) -o $@ $(LDEXECFLAGS) $(OBJS) -L$(DLLDIR) -lntdll.dll $(LIBWINE) $(LIBUNICODE) $(LIBPORT) $(LDFLAGS)
|
$(CC) -o $@ $(LDEXECFLAGS) $(OBJS) $(LIBWINE) $(LIBPORT) $(LDFLAGS)
|
||||||
|
|
||||||
install:: $(MODULE)
|
install:: $(MODULE)
|
||||||
$(MKINSTALLDIRS) $(bindir)
|
$(MKINSTALLDIRS) $(bindir)
|
||||||
|
|
Loading…
Reference in New Issue