Use -lwine for linking.

This commit is contained in:
Todd Vierling 1998-12-18 17:30:52 +00:00 committed by Alexandre Julliard
parent ae3fbab8e4
commit 8beb15aa95
4 changed files with 4 additions and 4 deletions

View File

@ -23,7 +23,7 @@ OPTIONS = @OPTIONS@ -D_REENTRANT
X_CFLAGS = @X_CFLAGS@ X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@ X_LIBS = @X_LIBS@
XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
WINELIB = $(WINESTUB) $(TOPOBJDIR)/@LIB_TARGET@ WINELIB = $(WINESTUB) -L$(TOPOBJDIR) -lwine
LIBS = @LIBS@ LIBS = @LIBS@
YACC = @YACC@ YACC = @YACC@
LEX = @LEX@ LEX = @LEX@

View File

@ -153,7 +153,7 @@ emu: wine
lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET)
wine wine.sym: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy wine wine.sym: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy
$(CC) -o wine $(EMUOBJS) $(LIB_TARGET) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) $(CC) -o wine $(EMUOBJS) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS)
nm -n wine | grep -v _compiled >wine.sym nm -n wine | grep -v _compiled >wine.sym
@echo "Wine build complete." @echo "Wine build complete."

2
configure vendored
View File

@ -563,7 +563,7 @@ test -z "$PROGEXT" && PROGEXT=""
MAIN_TARGET=emu MAIN_TARGET=emu
LIB_TARGET=libwine.a LIB_TARGET=libwine.a
ALT_LINK=" " ALT_LINK="-L\$(TOPOBJDIR) -lwine"
TRACE_MSGS=yes # the TRACE() macro TRACE_MSGS=yes # the TRACE() macro
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros. DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.

View File

@ -15,7 +15,7 @@ dnl **** Command-line arguments ****
dnl Default values dnl Default values
MAIN_TARGET=emu MAIN_TARGET=emu
LIB_TARGET=libwine.a LIB_TARGET=libwine.a
ALT_LINK=" " ALT_LINK="-L\$(TOPOBJDIR) -lwine"
TRACE_MSGS=yes # the TRACE() macro TRACE_MSGS=yes # the TRACE() macro
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros. DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.