Make it easy to use something other than wrc to compile resources.
diff --git a/Make.rules.in b/Make.rules.in
index 6cbf7a7..55d982d 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -65,7 +65,10 @@
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 @@
$(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 @@
# 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 701a6a8..af0c00b 100644
--- a/dlls/gdi/Makefile.in
+++ b/dlls/gdi/Makefile.in
@@ -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:
diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in
index 0537e38..9c0a262 100644
--- a/dlls/kernel/Makefile.in
+++ b/dlls/kernel/Makefile.in
@@ -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:
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 0885ace..65d9ef6 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -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
diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 0462443..1f34ff5 100644
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -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:
diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in
index c11eee1..5db18de 100644
--- a/programs/winhelp/Makefile.in
+++ b/programs/winhelp/Makefile.in
@@ -16,7 +16,7 @@
EXTRA_SRCS = macro.lex.l
EXTRA_OBJS = @LEX_OUTPUT_ROOT@.o
-EXTRAWRCFLAGS = -DWINELIB
+EXTRARCFLAGS = -DWINELIB
RC_SRCS = rsrc.rc
