diff options
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | beos/Makefile.target | 18 |
2 files changed, 16 insertions, 11 deletions
@@ -623,15 +623,6 @@ ifeq ($(TARGET),beos) $(Q)$(BEOS_MIMESET) $(EXETARGET) endif -ifeq ($(TARGET),beos) -$(RDEF_IMP_BEOS): $(RDEP_BEOS) - $(VQ)echo " GEN: $@" - $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ - -$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) - $(VQ)echo " RC: $<" - $(Q)$(BEOS_RC) -I beos -o $@ $^ -endif clean-target: $(VQ)echo " CLEAN: $(EXETARGET)" diff --git a/beos/Makefile.target b/beos/Makefile.target index 478593cf6..bab6429b8 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -27,8 +27,6 @@ BEOS_MIMESET := mimeset VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) -RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) -RESOURCES = $(RSRC_BEOS) ifeq ($(HOST),beos) CFLAGS += -I/boot/home/config/include \ @@ -124,6 +122,22 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS) EXETARGET := NetSurf # ---------------------------------------------------------------------------- +# Resources +# ---------------------------------------------------------------------------- + +RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) +RESOURCES = $(RSRC_BEOS) + +$(RDEF_IMP_BEOS): $(RDEP_BEOS) + $(VQ)echo " GEN: $@" + $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ + +$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) + $(VQ)echo " RC: $<" + $(Q)$(BEOS_RC) -I beos -o $@ $^ + + +# ---------------------------------------------------------------------------- # Install target # ---------------------------------------------------------------------------- |