Skip to content
Snippets Groups Projects
Commit 017a61e0 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Use .mc.rc extension for rc files generated by the message compiler.

parent 786c9a68
No related merge requests found
...@@ -60,6 +60,7 @@ WINEBUILD = $(TOPOBJDIR)/tools/winebuild/winebuild ...@@ -60,6 +60,7 @@ WINEBUILD = $(TOPOBJDIR)/tools/winebuild/winebuild
MAKEDEP = $(TOPOBJDIR)/tools/makedep MAKEDEP = $(TOPOBJDIR)/tools/makedep
WRC = $(TOPOBJDIR)/tools/wrc/wrc WRC = $(TOPOBJDIR)/tools/wrc/wrc
WMC = $(TOPOBJDIR)/tools/wmc/wmc WMC = $(TOPOBJDIR)/tools/wmc/wmc
LDPATH = LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH"
DLLDIR = $(TOPOBJDIR)/dlls DLLDIR = $(TOPOBJDIR)/dlls
@SET_MAKE@ @SET_MAKE@
...@@ -156,7 +157,7 @@ DLLS = \ ...@@ -156,7 +157,7 @@ DLLS = \
# Implicit rules # Implicit rules
.SUFFIXES: .mc .rc .res .spec .spec.c .spec.o .glue.c .SUFFIXES: .mc .rc .mc.rc .res .spec .spec.c .spec.o .glue.c
.c.o: .c.o:
$(CC) -c $(ALLCFLAGS) -o $*.o $< $(CC) -c $(ALLCFLAGS) -o $*.o $<
...@@ -170,17 +171,17 @@ DLLS = \ ...@@ -170,17 +171,17 @@ DLLS = \
.S.o: .S.o:
$(CC) -c -o $*.o $< $(CC) -c -o $*.o $<
.mc.rc: .mc.mc.rc:
LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WMC) -i -H /dev/null -o $@ $< $(LDPATH) $(WMC) -i -H /dev/null -o $@ $<
.rc.res: .rc.res:
LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $< $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
.spec.spec.c: .spec.spec.c:
LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -spec $< $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -spec $<
.c.glue.c: .c.glue.c:
LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $< $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
.c.ln: .c.ln:
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
...@@ -252,8 +253,8 @@ winapi_check:: ...@@ -252,8 +253,8 @@ winapi_check::
$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy $(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
cd `dirname $@` && $(MAKE) depend cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__) depend: $(MAKEDEP) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS) $(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(MC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS)
# Rules for cleaning # Rules for cleaning
...@@ -264,7 +265,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy ...@@ -264,7 +265,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
-cd `dirname $@` && $(RM) $(CLEAN_FILES) -cd `dirname $@` && $(RM) $(CLEAN_FILES)
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.rc) $(PROGRAMS) $(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(PROGRAMS)
# Rules for installing # Rules for installing
...@@ -282,7 +283,7 @@ $(GLUE:.c=.glue.c): $(WINEBUILD) $(TOPSRCDIR)/include/builtin16.h ...@@ -282,7 +283,7 @@ $(GLUE:.c=.glue.c): $(WINEBUILD) $(TOPSRCDIR)/include/builtin16.h
$(RC_SRCS:.rc=.res): $(WRC) $(RC_SRCS:.rc=.res): $(WRC)
$(MC_SRCS:.mc=.rc): $(WMC) $(MC_SRCS:.mc=.mc.rc): $(WMC)
$(SUBDIRS): dummy $(SUBDIRS): dummy
@cd $@ && $(MAKE) @cd $@ && $(MAKE)
......
...@@ -35,6 +35,6 @@ EXTRASUBDIRS = \ ...@@ -35,6 +35,6 @@ EXTRASUBDIRS = \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
depend $(RC_SRCS:.rc=.res): $(MC_SRCS:.mc=.rc) kernel.res: $(MC_SRCS:.mc=.mc.rc)
### Dependencies: ### Dependencies:
#include "locale_rc.rc" #include "locale_rc.rc"
#include "messages/winerr_enu.rc" #include "messages/winerr_enu.mc.rc"
*.rc *.mc.rc
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment