Make it easy to use something other than wrc to compile resources.
This commit is contained in:
parent
4f6caf6ca3
commit
1a1f9bffb3
|
@ -65,7 +65,10 @@ MAKEDEP = $(TOOLSDIR)/tools/makedep
|
||||||
WRC = $(TOOLSDIR)/tools/wrc/wrc
|
WRC = $(TOOLSDIR)/tools/wrc/wrc
|
||||||
WMC = $(TOOLSDIR)/tools/wmc/wmc
|
WMC = $(TOOLSDIR)/tools/wmc/wmc
|
||||||
WIDL = $(TOOLSDIR)/tools/widl/widl
|
WIDL = $(TOOLSDIR)/tools/widl/widl
|
||||||
WRCFLAGS = --nostdinc $(INCLUDES) $(EXTRAWRCFLAGS)
|
RC = $(WRC)
|
||||||
|
RC16 = $(WRC)
|
||||||
|
RCFLAGS = --nostdinc $(INCLUDES) $(EXTRARCFLAGS)
|
||||||
|
RC16FLAGS = -O res16 $(RCFLAGS)
|
||||||
LDPATH = @LDPATH@
|
LDPATH = @LDPATH@
|
||||||
DLLDIR = $(TOPOBJDIR)/dlls
|
DLLDIR = $(TOPOBJDIR)/dlls
|
||||||
LIBDIR = $(TOPOBJDIR)/libs
|
LIBDIR = $(TOPOBJDIR)/libs
|
||||||
|
@ -117,7 +120,7 @@ LINTS = $(C_SRCS:.c=.ln)
|
||||||
$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
|
$(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $<
|
||||||
|
|
||||||
.rc.res:
|
.rc.res:
|
||||||
$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ $<
|
$(LDPATH) $(RC) $(RCFLAGS) -fo$@ $<
|
||||||
|
|
||||||
.res.res.o:
|
.res.res.o:
|
||||||
$(WINDRES) -i $< -o $@
|
$(WINDRES) -i $< -o $@
|
||||||
|
@ -248,9 +251,7 @@ $(SUBDIRS:%=%/__crosstest__): dummy
|
||||||
|
|
||||||
# Misc. rules
|
# Misc. rules
|
||||||
|
|
||||||
$(RC_SRCS:.rc=.res): $(WRC)
|
$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC)
|
||||||
|
|
||||||
$(RC_SRCS16:.rc=.res): $(WRC)
|
|
||||||
|
|
||||||
$(MC_SRCS:.mc=.mc.rc): $(WMC)
|
$(MC_SRCS:.mc=.mc.rc): $(WMC)
|
||||||
|
|
||||||
|
|
|
@ -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
|
$(WINEBUILD) $(DEFS) -o $@ --heap 65520 --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/gdi.exe.spec
|
||||||
|
|
||||||
version16.res: version16.rc
|
version16.res: version16.rc
|
||||||
$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/version16.rc
|
$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
|
||||||
|
|
||||||
### Dependencies:
|
### Dependencies:
|
||||||
|
|
|
@ -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
|
$(WINEBUILD) $(DEFS) -o $@ --dll-name kernel --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/krnl386.exe.spec
|
||||||
|
|
||||||
version16.res: version16.rc
|
version16.res: version16.rc
|
||||||
$(LDPATH) $(WRC) $(WRCFLAGS) -o $@ -O res16 $(SRCDIR)/version16.rc
|
$(LDPATH) $(RC16) $(RC16FLAGS) -fo$@ $(SRCDIR)/version16.rc
|
||||||
|
|
||||||
### Dependencies:
|
### Dependencies:
|
||||||
|
|
|
@ -68,7 +68,7 @@ uninstall::
|
||||||
# Special rules for 16-bit resource files
|
# Special rules for 16-bit resource files
|
||||||
|
|
||||||
version16.res: version16.rc
|
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
|
shell.spec.c: shell.spec version16.res
|
||||||
$(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/shell.spec
|
$(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --res version16.res --spec $(SRCDIR)/shell.spec
|
||||||
|
|
|
@ -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
|
$(WINEBUILD) $(DEFS) -o $@ --main-module $(MODULE) --res resources/mouse.res --spec $(SRCDIR)/mouse.spec
|
||||||
|
|
||||||
resources/display.res: resources/display.rc
|
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
|
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
|
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:
|
### Dependencies:
|
||||||
|
|
|
@ -16,7 +16,7 @@ C_SRCS = \
|
||||||
EXTRA_SRCS = macro.lex.l
|
EXTRA_SRCS = macro.lex.l
|
||||||
EXTRA_OBJS = @LEX_OUTPUT_ROOT@.o
|
EXTRA_OBJS = @LEX_OUTPUT_ROOT@.o
|
||||||
|
|
||||||
EXTRAWRCFLAGS = -DWINELIB
|
EXTRARCFLAGS = -DWINELIB
|
||||||
|
|
||||||
RC_SRCS = rsrc.rc
|
RC_SRCS = rsrc.rc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue