From 1a1f9bffb39b5a471b5af709138ece6ec4062489 Mon Sep 17 00:00:00 2001
From: "Dimitrie O. Paun" <dpaun@rogers.com>
Date: Tue, 6 May 2003 18:34:53 +0000
Subject: [PATCH] Make it easy to use something other than wrc to compile
 resources.

---
 Make.rules.in                | 11 ++++++-----
 dlls/gdi/Makefile.in         |  2 +-
 dlls/kernel/Makefile.in      |  2 +-
 dlls/shell32/Makefile.in     |  2 +-
 dlls/user/Makefile.in        |  6 +++---
 programs/winhelp/Makefile.in |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Make.rules.in b/Make.rules.in
index 6cbf7a79bdb..55d982d0ab9 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -65,7 +65,10 @@ MAKEDEP      = $(TOOLSDIR)/tools/makedep
 WRC          = $(TOOLSDIR)/tools/wrc/wrc
 WMC          = $(TOOLSDIR)/tools/wmc/wmc
 WIDL         = $(TOOLSDIR)/tools/widl/widl
-WRCFLAGS     = --nostdinc $(INCLUDES) $(EXTRAWRCFLAGS)
+RC           = $(WRC)
+RC16         = $(WRC)
+RCFLAGS      = --nostdinc $(INCLUDES) $(EXTRARCFLAGS)
+RC16FLAGS    = -O res16 $(RCFLAGS)
 LDPATH       = @LDPATH@
 DLLDIR       = $(TOPOBJDIR)/dlls
 LIBDIR       = $(TOPOBJDIR)/libs
@@ -117,7 +120,7 @@ LINTS  = $(C_SRCS:.c=.ln)
 	$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
 
 .rc.res:
-	$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ $<
+	$(LDPATH) $(RC) $(RCFLAGS) -fo$@ $<
 
 .res.res.o:
 	$(WINDRES) -i $< -o $@
@@ -248,9 +251,7 @@ $(SUBDIRS:%=%/__crosstest__): dummy
 
 # Misc. rules
 
-$(RC_SRCS:.rc=.res): $(WRC)
-
-$(RC_SRCS16:.rc=.res): $(WRC)
+$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC)
 
 $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
diff --git a/dlls/gdi/Makefile.in b/dlls/gdi/Makefile.in
index 701a6a8ae97..af0c00b438b 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -83,6 +83,6 @@ gdi.exe.spec.c: gdi.exe.spec version16.res
 	$(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:
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index 0537e38a2c3..9c0a26280da 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -69,6 +69,6 @@ krnl386.exe.spec.c: krnl386.exe.spec version16.res
 	$(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:
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 0885aceab75..65d9ef67e8d 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -68,7 +68,7 @@ uninstall::
 # 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
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 0462443c740..1f34ff55644 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -120,12 +120,12 @@ mouse.spec.c: mouse.spec resources/mouse.res
 	$(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:
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index c11eee1b4ae..5db18de3a69 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -16,7 +16,7 @@ C_SRCS = \
 EXTRA_SRCS = macro.lex.l
 EXTRA_OBJS = @LEX_OUTPUT_ROOT@.o
 
-EXTRAWRCFLAGS = -DWINELIB
+EXTRARCFLAGS = -DWINELIB
 
 RC_SRCS = rsrc.rc