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

1 files changed, 10 insertions, 4 deletions

diff --git a/apps/plugins/imageviewer/jpeg/jpeg.make b/apps/plugins/imageviewer/jpeg/jpeg.make
index caf37fc74c..dd7addca56 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg.make
+++ b/apps/plugins/imageviewer/jpeg/jpeg.make
@@ -10,12 +10,18 @@
 JPEGSRCDIR := $(IMGVSRCDIR)/jpeg
 JPEGBUILDDIR := $(IMGVBUILDDIR)/jpeg
 
-ROCKS += $(JPEGBUILDDIR)/jpeg.rock
-
 JPEG_SRC := $(call preprocess, $(JPEGSRCDIR)/SOURCES)
 JPEG_OBJ := $(call c2obj, $(JPEG_SRC))
 
-# add source files to OTHER_SRC to get automatic dependencies
 OTHER_SRC += $(JPEG_SRC)
 
-$(JPEGBUILDDIR)/jpeg.rock: $(JPEG_OBJ)
+ROCKS += $(JPEGBUILDDIR)/jpeg.ovl
+
+$(JPEGBUILDDIR)/jpeg.refmap: $(JPEG_OBJ)
+$(JPEGBUILDDIR)/jpeg.link: $(PLUGIN_LDS) $(JPEGBUILDDIR)/jpeg.refmap
+$(JPEGBUILDDIR)/jpeg.ovl: $(JPEG_OBJ)
+
+# special pattern rule for compiling image decoder with extra flags
+$(JPEGBUILDDIR)/%.o: $(JPEGSRCDIR)/%.c $(JPEGSRCDIR)/jpeg.make
+        $(SILENT)mkdir -p $(dir $@)
+        $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) -I$(dir $<) $(IMGDECFLAGS) -c $< -o $@