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, 7 insertions, 6 deletions

diff --git a/apps/plugins/imageviewer/png/png.make b/apps/plugins/imageviewer/png/png.make
index 0a7106d2a9..dee89acb71 100644
--- a/apps/plugins/imageviewer/png/png.make
+++ b/apps/plugins/imageviewer/png/png.make
@@ -10,18 +10,19 @@
 PNGSRCDIR := $(IMGVSRCDIR)/png
 PNGBUILDDIR := $(IMGVBUILDDIR)/png
 
-ROCKS += $(PNGBUILDDIR)/png.rock
-
 PNG_SRC := $(call preprocess, $(PNGSRCDIR)/SOURCES)
 PNG_OBJ := $(call c2obj, $(PNG_SRC))
 
-# add source files to OTHER_SRC to get automatic dependencies
 OTHER_SRC += $(PNG_SRC)
 
-# Use -O3 for png plugin : it gives a bigger file but very good performances
-PNGFLAGS = $(PLUGINFLAGS) -Os
+ROCKS += $(PNGBUILDDIR)/png.ovl
 
-$(PNGBUILDDIR)/png.rock: $(PNG_OBJ)
+$(PNGBUILDDIR)/png.refmap: $(PNG_OBJ)
+$(PNGBUILDDIR)/png.link: $(PNG_OBJ) $(PNGBUILDDIR)/png.refmap
+$(PNGBUILDDIR)/png.ovl: $(PNG_OBJ)
+
+# Use -O3 for png plugin : it gives a bigger file but very good performances
+PNGFLAGS = $(IMGDECFLAGS) -Os
 
 # Compile PNG plugin with extra flags (adapted from ZXBox)
 $(PNGBUILDDIR)/%.o: $(PNGSRCDIR)/%.c $(PNGSRCDIR)/png.make