Commit 8beb15aa authored by Todd Vierling's avatar Todd Vierling Committed by Alexandre Julliard

Use -lwine for linking.

parent ae3fbab8
......@@ -23,7 +23,7 @@ OPTIONS = @OPTIONS@ -D_REENTRANT
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
WINELIB = $(WINESTUB) $(TOPOBJDIR)/@LIB_TARGET@
WINELIB = $(WINESTUB) -L$(TOPOBJDIR) -lwine
LIBS = @LIBS@
YACC = @YACC@
LEX = @LEX@
......
......@@ -153,7 +153,7 @@ emu: wine
lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET)
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
@echo "Wine build complete."
......
......@@ -563,7 +563,7 @@ test -z "$PROGEXT" && PROGEXT=""
MAIN_TARGET=emu
LIB_TARGET=libwine.a
ALT_LINK=" "
ALT_LINK="-L\$(TOPOBJDIR) -lwine"
TRACE_MSGS=yes # the TRACE() macro
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.
......
......@@ -15,7 +15,7 @@ dnl **** Command-line arguments ****
dnl Default values
MAIN_TARGET=emu
LIB_TARGET=libwine.a
ALT_LINK=" "
ALT_LINK="-L\$(TOPOBJDIR) -lwine"
TRACE_MSGS=yes # the TRACE() macro
DEBUG_MSGS=yes # the TRACE(), WARN(), and FIXME() macros.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment