From b2329f081e3104d2f1f36f0c08692a6bad38cc5d Mon Sep 17 00:00:00 2001 From: imker Date: Mon, 1 Jun 2009 10:26:58 +0000 Subject: [PATCH] - added preprocessing of RDEF scripts during resource compilation; - version of makefile template increased to 2.3 because of adding RDEFS list in previous commit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30936 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- data/develop/makefile | 2 +- data/develop/makefile-engine | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/develop/makefile b/data/develop/makefile index 30f3438386..e50b2b05f4 100644 --- a/data/develop/makefile +++ b/data/develop/makefile @@ -1,4 +1,4 @@ -## BeOS Generic Makefile v2.2 ## +## BeOS Generic Makefile v2.3 ## ## Fill in this file to specify the project being created, and the referenced ## makefile-engine will do all of the hard work for you. This handles both diff --git a/data/develop/makefile-engine b/data/develop/makefile-engine index 03b8d6da02..3f184300f1 100644 --- a/data/develop/makefile-engine +++ b/data/develop/makefile-engine @@ -2,7 +2,7 @@ ## Does all the hard work for the Generic Makefile ## which simply defines the project parameters -## Supports Generic Makefile v2.0, 2.01, 2.1, 2.2 +## Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3 # determine wheather running on x86 or ppc MACHINE=$(shell uname -m) @@ -351,9 +351,9 @@ $(OBJ_DIR)/%.o : %.CPP # rules to compile resource definition files $(OBJ_DIR)/%.rsrc : %.rdef - $(RESCOMP) -o $@ $< + cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o $@ - $(OBJ_DIR)/%.rsrc : %.RDEF - $(RESCOMP) -o $@ $< + cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o $@ - # rules to handle lex/flex and yacc/bison files