From e5b1a7d4237a9006b6c49c9c1c13b292ca4ecf7c Mon Sep 17 00:00:00 2001
From: Teruaki Kawashima <teru@rockbox.org>
Date: Sun, 21 Nov 2010 13:47:56 +0000
Subject: FS#6321: Universal Image Viewer This unifies jpeg viewer, png viewer,
 and bmp viewer to one plugin, image viewer, so that you can navigate through
 different image formats.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28626 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/imageviewer/bmp/bmp.make | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'apps/plugins/imageviewer/bmp/bmp.make')

diff --git a/apps/plugins/imageviewer/bmp/bmp.make b/apps/plugins/imageviewer/bmp/bmp.make
index 0582ba3eb3..0947dd6166 100644
--- a/apps/plugins/imageviewer/bmp/bmp.make
+++ b/apps/plugins/imageviewer/bmp/bmp.make
@@ -10,12 +10,18 @@
 BMPSRCDIR := $(IMGVSRCDIR)/bmp
 BMPBUILDDIR := $(IMGVBUILDDIR)/bmp
 
-ROCKS += $(BMPBUILDDIR)/bmp.rock
-
 BMP_SRC := $(call preprocess, $(BMPSRCDIR)/SOURCES)
 BMP_OBJ := $(call c2obj, $(BMP_SRC))
 
-# add source files to OTHER_SRC to get automatic dependencies
 OTHER_SRC += $(BMP_SRC)
 
-$(BMPBUILDDIR)/bmp.rock: $(BMP_OBJ)
+ROCKS += $(BMPBUILDDIR)/bmp.ovl
+
+$(BMPBUILDDIR)/bmp.refmap: $(BMP_OBJ)
+$(BMPBUILDDIR)/bmp.link: $(PLUGIN_LDS) $(BMPBUILDDIR)/bmp.refmap
+$(BMPBUILDDIR)/bmp.ovl: $(BMP_OBJ)
+
+# special pattern rule for compiling image decoder with extra flags
+$(BMPBUILDDIR)/%.o: $(BMPSRCDIR)/%.c $(BMPSRCDIR)/bmp.make
+	$(SILENT)mkdir -p $(dir $@)
+	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(IMGDECFLAGS) -c $< -o $@
-- 
cgit v1.2.3