Skip to content

W
wine-winehq
Commit a387aa48 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

Migrate $LDFLAGS from configure to Makefile and into main wine

executable.
parent c23bf433
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
Make.rules.in
View file @ a387aa48
...@@ -40,6 +40,7 @@ LN_S = @LN_S@ ...@@ -40,6 +40,7 @@ LN_S = @LN_S@
DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include DIVINCL = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include
ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS) ALLCFLAGS = $(DIVINCL) $(CFLAGS) $(DEFS) $(OPTIONS) $(X_CFLAGS)
LDCOMBINE = ld -r LDCOMBINE = ld -r
LDFLAGS = @LDFLAGS@
AR = ar rc AR = ar rc
RM = rm -f RM = rm -f
MV = mv MV = mv
......
Makefile.in
View file @ a387aa48
...@@ -115,7 +115,7 @@ Make.rules: Make.rules.in configure ...@@ -115,7 +115,7 @@ Make.rules: Make.rules.in configure
@exit 1 @exit 1
wine: libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) dlls $(EMUOBJS) wine: libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) dlls $(EMUOBJS)
$(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) $(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) $(LDFLAGS)
llib-lwine.ln : $(LIBLINTS) llib-lwine.ln : $(LIBLINTS)
$(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS) $(LINT) $(ALLLINTFLAGS) -owine $(LIBLINTS)
......
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