From 8035d12a83a5b64d589a38d9becae164cd62f3f6 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 7 Dec 2014 12:26:30 -0600 Subject: Add logic to build the demo world as a ROMFS file system --- apps/graphics/traveler/Makefile | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'apps/graphics/traveler/Makefile') diff --git a/apps/graphics/traveler/Makefile b/apps/graphics/traveler/Makefile index 516613703..1f39d1af6 100644 --- a/apps/graphics/traveler/Makefile +++ b/apps/graphics/traveler/Makefile @@ -37,6 +37,13 @@ -include $(TOPDIR)/Make.defs include $(APPDIR)/Make.defs +# Directories + +TRAVELER_DIR = $(APPDIR)/graphics/traveler +TRAVELER_SRC = $(TRAVELER_DIR)/src +TRAVELER_INC = $(TRAVELER_DIR)/include +TRAVELER_DEMO = $(TRAVELER_DIR)/world + # Traveler built-in application info APPNAME = traveler @@ -52,6 +59,11 @@ CSRCS += trv_mem.c trv_paltbl.c trv_pcx.c trv_planefiles.c trv_planelists.c CSRCS += trv_pov.c trv_rayavoid.c trv_raycast.c trv_raycntl.c CSRCS += trv_rayprune.c trv_rayrend.c trv_texturefile.c trv_trigtbl.c CSRCS += trv_world.c + +ifeq ($(CONFIG_GRAPHICS_TRAVELER_ROMFSDEMO),y) +CSRCS += trv_romfs.c +endif + MAINSRC = trv_main.c ifeq ($(CONFIG_NX),y) @@ -72,6 +84,11 @@ ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif +ifeq ($(CONFIG_GRAPHICS_TRAVELER_ROMFSDEMO),y) +ROMFS_IMG = trv_romfs.img +ROMFS_HDR = trv_romfs.h +endif + ifeq ($(CONFIG_WINDOWS_NATIVE),y) BIN = ..\..\libapps$(LIBEXT) else @@ -95,10 +112,10 @@ ifeq ($(WINTOOL),y) INCDIROPT = -w endif -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(APPDIR)/graphics/traveler/include} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TRAVELER_INC)} -DEPPATH = --dep-path src -VPATH = src +DEPPATH = --dep-path . --dep-path src +VPATH = .:src # Common build @@ -111,7 +128,15 @@ $(AOBJS): %$(OBJEXT): %.S $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call COMPILE, $<, $@) -.built: $(OBJS) +ifeq ($(CONFIG_GRAPHICS_TRAVELER_ROMFSDEMO),y) +$(ROMFS_IMG): + $(Q) genromfs -f $@ -d $(TRAVELER_DEMO) -V "DemoWorld" + +$(ROMFS_HDR): $(ROMFS_IMG) + $(Q) (xxd -i $< | sed -e "s/^unsigned/static const unsigned/g" >$@) +endif + +.built: $(ROMFS_HDR) $(OBJS) $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built @@ -145,6 +170,8 @@ depend: .depend clean: $(call DELFILE, .built) + $(call DELFILE, $(ROMFS_IMG)) + $(call DELFILE, $(ROMFS_HDR)) $(call CLEAN) distclean: clean -- cgit v1.2.3