Alexandre Julliard : makefiles: Pass target options to wrc.

Alexandre Julliard julliard at winehq.org
Thu Sep 30 11:23:34 CDT 2010


Module: wine
Branch: master
Commit: c685b99d9bbf8ba4f58a8f7c22770f019484d9f4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c685b99d9bbf8ba4f58a8f7c22770f019484d9f4

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep 29 20:13:44 2010 +0200

makefiles: Pass target options to wrc.

---

 Make.rules.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 5415e8c..c5518c1 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -17,7 +17,7 @@ INCLUDES     = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include
 ALLCFLAGS    = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
 ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
 IDLFLAGS     = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
-RCFLAGS      = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
+RCFLAGS      = --nostdinc $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
 
 IDL_GEN_C_SRCS  = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \
                   $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c)
@@ -62,7 +62,7 @@ filter: dummy
 	$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
 
 .rc.res:
-	$(LDPATH) $(WRC) $(RCFLAGS) -fo$@ $<
+	$(LDPATH) $(WRC) $(RCFLAGS) -o $@ $<
 
 .idl.h:
 	$(WIDL) $(IDLFLAGS) -h -H $@ $<




More information about the wine-cvs mailing list