From 95538f694901263d7a5282901acb73958082ea82 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Tue, 21 Feb 2006 01:23:30 +0000 Subject: First attempt at generating and using .h files from bitmaps using bmp2rb. The .h files are generated for both the core bitmaps and the plugins, but are only currently being used in the core. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8759 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/Makefile | 8 +++++++- apps/plugins/bitmaps/mono/Makefile | 1 + apps/plugins/bitmaps/native/Makefile | 1 + apps/plugins/bitmaps/remote_mono/Makefile | 1 + apps/plugins/bitmaps/remote_native/Makefile | 1 + 5 files changed, 11 insertions(+), 1 deletion(-) (limited to 'apps/plugins') diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index f7bd102..404f166 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile @@ -8,7 +8,8 @@ # INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ - -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) + -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) \ + -I$(BUILDDIR)/pluginbitmaps CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN @@ -72,6 +73,10 @@ endif .PHONY: $(SUBDIRS) all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) +$(DEPFILE): $(BITMAPLIBS) + +dep: $(DEPFILE) + $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS @echo "create credits.raw" $(SILENT)perl credits.pl < $< > $@ @@ -197,5 +202,6 @@ clean: $(SILENT)$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native $(SILENT)$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy $(SILENT)$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine + @rm -rf $(BUILDDIR)/pluginbitmaps -include $(DEPFILE) diff --git a/apps/plugins/bitmaps/mono/Makefile b/apps/plugins/bitmaps/mono/Makefile index 54c0677..7b7e052 100644 --- a/apps/plugins/bitmaps/mono/Makefile +++ b/apps/plugins/bitmaps/mono/Makefile @@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-mono BMP2RB = $(BMP2RB_MONO) OUTPUT = $(BUILDDIR)/libpluginbitmapsmono.a +BMPINCDIR = $(BUILDDIR)/pluginbitmaps include $(TOOLSDIR)/makebmp.inc diff --git a/apps/plugins/bitmaps/native/Makefile b/apps/plugins/bitmaps/native/Makefile index fd77a62..d7745ee 100644 --- a/apps/plugins/bitmaps/native/Makefile +++ b/apps/plugins/bitmaps/native/Makefile @@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-native BMP2RB = $(BMP2RB_NATIVE) OUTPUT = $(BUILDDIR)/libpluginbitmapsnative.a +BMPINCDIR = $(BUILDDIR)/pluginbitmaps include $(TOOLSDIR)/makebmp.inc diff --git a/apps/plugins/bitmaps/remote_mono/Makefile b/apps/plugins/bitmaps/remote_mono/Makefile index 0875b4c..db846e2 100644 --- a/apps/plugins/bitmaps/remote_mono/Makefile +++ b/apps/plugins/bitmaps/remote_mono/Makefile @@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotemono BMP2RB = $(BMP2RB_REMOTEMONO) OUTPUT = $(BUILDDIR)/libpluginbitmapsremotemono.a +BMPINCDIR = $(BUILDDIR)/pluginbitmaps include $(TOOLSDIR)/makebmp.inc diff --git a/apps/plugins/bitmaps/remote_native/Makefile b/apps/plugins/bitmaps/remote_native/Makefile index 91a4290..405f3fd 100644 --- a/apps/plugins/bitmaps/remote_native/Makefile +++ b/apps/plugins/bitmaps/remote_native/Makefile @@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotenative BMP2RB = $(BMP2RB_REMOTENATIVE) OUTPUT = $(BUILDDIR)/libpluginbitmapsremotenative.a +BMPINCDIR = $(BUILDDIR)/pluginbitmaps include $(TOOLSDIR)/makebmp.inc -- cgit v1.1