Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add input rdef location to include dir, otherwise when rc reads from stdin, 

no include dir is defined and import commands will failed then.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39825 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2010-12-13 11:58:15 +00:00
parent bfd3cafa8b
commit 8a07a69693
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/develop/makefile-engine
View File

@ -153,7 +153,7 @@ ifeq ($(CPU), ppc)
LOC_INCLUDES = $(foreach path, $(SRC_PATHS) $(LOCAL_INCLUDE_PATHS), $(addprefix -I, $(path)))
SYS_INCLUDES += -i-
SYS_INCLUDES += $(foreach path, $(SYSTEM_INCLUDE_PATHS), $(addprefix -i , $(path)))
INCLUDES = $(LOC_INCLUDES) $(SYS_INCLUDES)
endif
endif
@ -272,9 +272,9 @@ $(OBJ_DIR)/%.o : %.CPP
# rules to compile resource definition files
$(OBJ_DIR)/%.rsrc : %.rdef
cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o "$@" -
cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -I $(dir $<) -o "$@" -
$(OBJ_DIR)/%.rsrc : %.RDEF
cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o "$@" -
cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -I $(dir $<) -o "$@" -
# rules to handle lex/flex and yacc/bison files