$(RC) portability

[Dimitrie O. Paun]

On April 29, 2003 09:03 pm, Alexandre Julliard wrote:
> You can't remove the -o options, wrc cannot guess where the output
> file should go.

Of course, I don't know what I was thinking. I was tricked by the fact
that I had the old .res already compiled in my build dir...

Here it is again, with -fo instead of -o.

ChangeLog
  Make it easy to use something other than wrc to compile resources.

Index: Make.rules.in
===================================================================
RCS file: /var/cvs/wine/Make.rules.in,v
retrieving revision 1.155
diff -u -r1.155 Make.rules.in
--- Make.rules.in	21 Apr 2003 23:54:06 -0000	1.155
+++ Make.rules.in	30 Apr 2003 21:37:04 -0000
@@ -62,10 +62,12 @@
 RUNTEST      = $(TOPSRCDIR)/tools/runtest
 WINEBUILD    = $(TOOLSDIR)/tools/winebuild/winebuild
 MAKEDEP      = $(TOOLSDIR)/tools/makedep
-WRC          = $(TOOLSDIR)/tools/wrc/wrc
+RC           = $(TOOLSDIR)/tools/wrc/wrc
+RC16         = $(TOOLSDIR)/tools/wrc/wrc
 WMC          = $(TOOLSDIR)/tools/wmc/wmc
 WIDL         = $(TOOLSDIR)/tools/widl/widl
-WRCFLAGS     = --nostdinc $(INCLUDES) $(EXTRAWRCFLAGS)
+RCFLAGS      = --nostdinc $(INCLUDES) $(EXTRARCFLAGS)
+RC16FLAGS    = -O res16 $(RCFLAGS)
 LDPATH       = @LDPATH@
 DLLDIR       = $(TOPOBJDIR)/dlls
 LIBPORT      = -L$(TOPOBJDIR)/libs/port -lwine_port
@@ -116,7 +118,7 @@
 	$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
 
 .rc.res:
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ $<
+	$(LDPATH) $(RC) $(RCFLAGS) -fo$@ $<
 
 .res.res.o:
 	$(WINDRES) -i $< -o $@
@@ -247,9 +249,9 @@
 
 # Misc. rules
 
-$(RC_SRCS:.rc=.res): $(WRC)
+$(RC_SRCS:.rc=.res): $(RC)
 
-$(RC_SRCS16:.rc=.res): $(WRC)
+$(RC_SRCS16:.rc=.res): $(RC)
 
 $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
Index: ./dlls/gdi/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/Makefile.in,v
retrieving revision 1.50
diff -u -r1.50 Makefile.in
--- ./dlls/gdi/Makefile.in	21 Apr 2003 23:54:06 -0000	1.50
+++ ./dlls/gdi/Makefile.in	30 Apr 2003 21:37:50 -0000
@@ -83,6 +83,6 @@
 	$(WINEBUILD) $(DEFS) -o $@ --heap 65520 --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/gdi.exe.spec
 
 version16.res: version16.rc
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/version16.rc
+	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
 
 ### Dependencies:
Index: ./dlls/kernel/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/Makefile.in,v
retrieving revision 1.64
diff -u -r1.64 Makefile.in
--- ./dlls/kernel/Makefile.in	30 Apr 2003 00:53:23 -0000	1.64
+++ ./dlls/kernel/Makefile.in	30 Apr 2003 21:38:17 -0000
@@ -69,6 +69,6 @@
 	$(WINEBUILD) $(DEFS) -o $@ --dll-name kernel --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/krnl386.exe.spec
 
 version16.res: version16.rc
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/version16.rc
+	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
 
 ### Dependencies:
Index: ./dlls/shell32/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/shell32/Makefile.in,v
retrieving revision 1.65
diff -u -r1.65 Makefile.in
--- ./dlls/shell32/Makefile.in	21 Apr 2003 23:54:06 -0000	1.65
+++ ./dlls/shell32/Makefile.in	29 Apr 2003 05:34:33 -0000
@@ -68,7 +68,7 @@
 # Special rules for 16-bit resource files
 
 version16.res: version16.rc
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/version16.rc
+	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
 
 shell.spec.c: shell.spec version16.res
 	$(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/shell.spec
Index: ./dlls/user/Makefile.in
===================================================================
RCS file: /var/cvs/wine/dlls/user/Makefile.in,v
retrieving revision 1.69
diff -u -r1.69 Makefile.in
--- ./dlls/user/Makefile.in	21 Apr 2003 23:54:05 -0000	1.69
+++ ./dlls/user/Makefile.in	30 Apr 2003 21:39:18 -0000
@@ -120,12 +120,12 @@
 	$(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --res resources/mouse.res --spec $(SRCDIR)/mouse.spec
 
 resources/display.res: resources/display.rc
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/resources/display.rc
+	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/display.rc
 
 resources/mouse.res: resources/mouse.rc
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/resources/mouse.rc
+	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/mouse.rc
 
 resources/version16.res: resources/version16.rc
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/resources/version16.rc
+	$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/resources/version16.rc
 
 ### Dependencies:
Index: ./programs/winhelp/Makefile.in
===================================================================
RCS file: /var/cvs/wine/programs/winhelp/Makefile.in,v
retrieving revision 1.34
diff -u -r1.34 Makefile.in
--- ./programs/winhelp/Makefile.in	11 Dec 2002 01:34:51 -0000	1.34
+++ ./programs/winhelp/Makefile.in	26 Apr 2003 14:32:58 -0000
@@ -16,7 +16,7 @@
 EXTRA_SRCS = macro.lex.l
 EXTRA_OBJS = @LEX_OUTPUT_ROOT at .o
 
-EXTRAWRCFLAGS = -DWINELIB
+EXTRARCFLAGS = -DWINELIB
 
 RC_SRCS = rsrc.rc
 


-- 
Dimi.