diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 7 | ||||
-rw-r--r-- | apps/bitmaps/mono/Makefile | 1 | ||||
-rw-r--r-- | apps/bitmaps/native/Makefile | 1 | ||||
-rw-r--r-- | apps/bitmaps/remote_mono/Makefile | 1 | ||||
-rw-r--r-- | apps/bitmaps/remote_native/Makefile | 1 | ||||
-rw-r--r-- | apps/misc.c | 6 | ||||
-rw-r--r-- | apps/plugins/Makefile | 8 | ||||
-rw-r--r-- | apps/plugins/bitmaps/mono/Makefile | 1 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/Makefile | 1 | ||||
-rw-r--r-- | apps/plugins/bitmaps/remote_mono/Makefile | 1 | ||||
-rw-r--r-- | apps/plugins/bitmaps/remote_native/Makefile | 1 | ||||
-rw-r--r-- | apps/recorder/icons.h | 49 |
12 files changed, 32 insertions, 46 deletions
diff --git a/apps/Makefile b/apps/Makefile index 26f96a5b79..55386c9e43 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -8,7 +8,7 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR) \ | 10 | INCLUDES= -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDIR) \ |
11 | -I$(OBJDIR) | 11 | -I$(BUILDDIR)/bitmaps -I$(OBJDIR) |
12 | 12 | ||
13 | DEPFILE = $(OBJDIR)/dep-apps | 13 | DEPFILE = $(OBJDIR)/dep-apps |
14 | LDS := $(FIRMDIR)/app.lds | 14 | LDS := $(FIRMDIR)/app.lds |
@@ -85,6 +85,8 @@ endif | |||
85 | all: $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) | 85 | all: $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) |
86 | endif | 86 | endif |
87 | 87 | ||
88 | $(DEPFILE): $(BITMAPLIBS) | ||
89 | |||
88 | dep: $(DEPFILE) | 90 | dep: $(DEPFILE) |
89 | 91 | ||
90 | build-codecs: | 92 | build-codecs: |
@@ -95,7 +97,7 @@ build-bitmaps: | |||
95 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps | 97 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps |
96 | 98 | ||
97 | $(BITMAPLIBS): build-bitmaps | 99 | $(BITMAPLIBS): build-bitmaps |
98 | 100 | ||
99 | rocks: build-codecs | 101 | rocks: build-codecs |
100 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib | 102 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib |
101 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins | 103 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins |
@@ -212,6 +214,7 @@ clean: | |||
212 | @$(MAKE) -C plugins clean OBJDIR=$(OBJDIR)/plugins | 214 | @$(MAKE) -C plugins clean OBJDIR=$(OBJDIR)/plugins |
213 | @$(MAKE) -C codecs clean OBJDIR=$(OBJDIR)/codecs | 215 | @$(MAKE) -C codecs clean OBJDIR=$(OBJDIR)/codecs |
214 | @rm -rf $(OBJDIR)/recorder $(OBJDIR)/player | 216 | @rm -rf $(OBJDIR)/recorder $(OBJDIR)/player |
217 | @rm -rf $(BUILDDIR)/bitmaps | ||
215 | ifdef SIMVER | 218 | ifdef SIMVER |
216 | @$(MAKE) -C $(SIMDIR) clean | 219 | @$(MAKE) -C $(SIMDIR) clean |
217 | endif | 220 | endif |
diff --git a/apps/bitmaps/mono/Makefile b/apps/bitmaps/mono/Makefile index ec75520735..a678b01ef4 100644 --- a/apps/bitmaps/mono/Makefile +++ b/apps/bitmaps/mono/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-mono | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_MONO) | 22 | BMP2RB = $(BMP2RB_MONO) |
23 | OUTPUT = $(BUILDDIR)/libbitmapsmono.a | 23 | OUTPUT = $(BUILDDIR)/libbitmapsmono.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/bitmaps/native/Makefile b/apps/bitmaps/native/Makefile index 17e9376dd9..49e941799e 100644 --- a/apps/bitmaps/native/Makefile +++ b/apps/bitmaps/native/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-native | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_NATIVE) | 22 | BMP2RB = $(BMP2RB_NATIVE) |
23 | OUTPUT = $(BUILDDIR)/libbitmapsnative.a | 23 | OUTPUT = $(BUILDDIR)/libbitmapsnative.a |
24 | BMPINCDIR = $(BUILDDIR)/bitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/bitmaps/remote_mono/Makefile b/apps/bitmaps/remote_mono/Makefile index 9f6997c71a..4e119ba76d 100644 --- a/apps/bitmaps/remote_mono/Makefile +++ b/apps/bitmaps/remote_mono/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotemono | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_REMOTEMONO) | 22 | BMP2RB = $(BMP2RB_REMOTEMONO) |
23 | OUTPUT = $(BUILDDIR)/libbitmapsremotemono.a | 23 | OUTPUT = $(BUILDDIR)/libbitmapsremotemono.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/bitmaps/remote_native/Makefile b/apps/bitmaps/remote_native/Makefile index 882505ded9..573ee554b2 100644 --- a/apps/bitmaps/remote_native/Makefile +++ b/apps/bitmaps/remote_native/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotenative | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_REMOTENATIVE) | 22 | BMP2RB = $(BMP2RB_REMOTENATIVE) |
23 | OUTPUT = $(BUILDDIR)/libbitmapsremotenative.a | 23 | OUTPUT = $(BUILDDIR)/libbitmapsremotenative.a |
24 | BMPINCDIR = $(BUILDDIR)/bitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/misc.c b/apps/misc.c index c815589c06..6493e7b46f 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -604,12 +604,12 @@ int show_logo( void ) | |||
604 | int font_h, font_w; | 604 | int font_h, font_w; |
605 | 605 | ||
606 | lcd_clear_display(); | 606 | lcd_clear_display(); |
607 | lcd_bitmap(rockboxlogo, 0, 10, ROCKBOXLOGO_WIDTH, ROCKBOXLOGO_HEIGHT); | 607 | lcd_bitmap(rockboxlogo, 0, 10, BMPWIDTH_rockboxlogo, BMPHEIGHT_rockboxlogo); |
608 | 608 | ||
609 | #ifdef HAVE_REMOTE_LCD | 609 | #ifdef HAVE_REMOTE_LCD |
610 | lcd_remote_clear_display(); | 610 | lcd_remote_clear_display(); |
611 | lcd_remote_bitmap(remote_rockboxlogo,10,14,REMOTE_ROCKBOXLOGO_WIDTH, | 611 | lcd_remote_bitmap(remote_rockboxlogo,10,14,BMPWIDTH_remote_rockboxlogo, |
612 | REMOTE_ROCKBOXLOGO_HEIGHT); | 612 | BMPHEIGHT_remote_rockboxlogo); |
613 | #endif | 613 | #endif |
614 | 614 | ||
615 | snprintf(version, sizeof(version), "Ver. %s", appsversion); | 615 | snprintf(version, sizeof(version), "Ver. %s", appsversion); |
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index f7bd102a5b..404f1662e2 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -8,7 +8,8 @@ | |||
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ | 10 | INCLUDES = -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I$(FIRMDIR)/common \ |
11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) | 11 | -I$(FIRMDIR)/drivers -I$(APPSDIR) -Ilib -I$(BUILDDIR) \ |
12 | -I$(BUILDDIR)/pluginbitmaps | ||
12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ | 13 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) \ |
13 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN | 14 | -DTARGET_ID=$(TARGET_ID) -DMEM=${MEMORYSIZE} -DPLUGIN |
14 | 15 | ||
@@ -72,6 +73,10 @@ endif | |||
72 | .PHONY: $(SUBDIRS) | 73 | .PHONY: $(SUBDIRS) |
73 | all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) | 74 | all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) |
74 | 75 | ||
76 | $(DEPFILE): $(BITMAPLIBS) | ||
77 | |||
78 | dep: $(DEPFILE) | ||
79 | |||
75 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS | 80 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS |
76 | @echo "create credits.raw" | 81 | @echo "create credits.raw" |
77 | $(SILENT)perl credits.pl < $< > $@ | 82 | $(SILENT)perl credits.pl < $< > $@ |
@@ -197,5 +202,6 @@ clean: | |||
197 | $(SILENT)$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native | 202 | $(SILENT)$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native |
198 | $(SILENT)$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy | 203 | $(SILENT)$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy |
199 | $(SILENT)$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine | 204 | $(SILENT)$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine |
205 | @rm -rf $(BUILDDIR)/pluginbitmaps | ||
200 | 206 | ||
201 | -include $(DEPFILE) | 207 | -include $(DEPFILE) |
diff --git a/apps/plugins/bitmaps/mono/Makefile b/apps/plugins/bitmaps/mono/Makefile index 54c06770b8..7b7e052117 100644 --- a/apps/plugins/bitmaps/mono/Makefile +++ b/apps/plugins/bitmaps/mono/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-mono | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_MONO) | 22 | BMP2RB = $(BMP2RB_MONO) |
23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsmono.a | 23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsmono.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/plugins/bitmaps/native/Makefile b/apps/plugins/bitmaps/native/Makefile index fd77a6213c..d7745ee9e2 100644 --- a/apps/plugins/bitmaps/native/Makefile +++ b/apps/plugins/bitmaps/native/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-native | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_NATIVE) | 22 | BMP2RB = $(BMP2RB_NATIVE) |
23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsnative.a | 23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsnative.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/plugins/bitmaps/remote_mono/Makefile b/apps/plugins/bitmaps/remote_mono/Makefile index 0875b4cbb5..db846e23a7 100644 --- a/apps/plugins/bitmaps/remote_mono/Makefile +++ b/apps/plugins/bitmaps/remote_mono/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotemono | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_REMOTEMONO) | 22 | BMP2RB = $(BMP2RB_REMOTEMONO) |
23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsremotemono.a | 23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsremotemono.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/plugins/bitmaps/remote_native/Makefile b/apps/plugins/bitmaps/remote_native/Makefile index 91a42908f5..405f3fd5af 100644 --- a/apps/plugins/bitmaps/remote_native/Makefile +++ b/apps/plugins/bitmaps/remote_native/Makefile | |||
@@ -21,6 +21,7 @@ DEPFILE = $(OBJDIR)/dep-bitmaps-remotenative | |||
21 | 21 | ||
22 | BMP2RB = $(BMP2RB_REMOTENATIVE) | 22 | BMP2RB = $(BMP2RB_REMOTENATIVE) |
23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsremotenative.a | 23 | OUTPUT = $(BUILDDIR)/libpluginbitmapsremotenative.a |
24 | BMPINCDIR = $(BUILDDIR)/pluginbitmaps | ||
24 | 25 | ||
25 | include $(TOOLSDIR)/makebmp.inc | 26 | include $(TOOLSDIR)/makebmp.inc |
26 | 27 | ||
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 14e84cd64f..62ed73aeac 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -21,11 +21,19 @@ | |||
21 | 21 | ||
22 | #include <lcd.h> | 22 | #include <lcd.h> |
23 | 23 | ||
24 | #ifdef HAVE_LCD_BITMAP | ||
25 | |||
26 | /* External bitmaps */ | ||
27 | |||
28 | #include <rockboxlogo.h> | ||
29 | #ifdef HAVE_REMOTE_LCD | ||
30 | #include <remote_rockboxlogo.h> | ||
31 | #endif | ||
32 | |||
24 | /* | 33 | /* |
25 | * Icons of size 6x8 pixels | 34 | * Icons of size 6x8 pixels |
26 | */ | 35 | */ |
27 | 36 | ||
28 | #ifdef HAVE_LCD_BITMAP | ||
29 | 37 | ||
30 | /* Symbolic names for icons */ | 38 | /* Symbolic names for icons */ |
31 | enum icons_5x8 { | 39 | enum icons_5x8 { |
@@ -78,45 +86,6 @@ extern const unsigned char bitmap_icons_6x8[Icon6x8Last][6]; | |||
78 | extern const unsigned char bitmap_icons_7x8[Icon7x8Last][7]; | 86 | extern const unsigned char bitmap_icons_7x8[Icon7x8Last][7]; |
79 | extern const unsigned char bitmap_icon_disk[]; | 87 | extern const unsigned char bitmap_icon_disk[]; |
80 | 88 | ||
81 | extern const fb_data rockboxlogo[]; | ||
82 | |||
83 | #if LCD_DEPTH == 1 | ||
84 | /* Archos targets */ | ||
85 | #define ROCKBOXLOGO_WIDTH 112 | ||
86 | #define ROCKBOXLOGO_HEIGHT 37 | ||
87 | |||
88 | #elif (LCD_WIDTH == 160) && (LCD_DEPTH == 2) | ||
89 | /* iRiver H1x0 */ | ||
90 | #define ROCKBOXLOGO_WIDTH 160 | ||
91 | #define ROCKBOXLOGO_HEIGHT 53 | ||
92 | |||
93 | #elif (LCD_WIDTH == 160) && (LCD_DEPTH == 16) | ||
94 | /* iAudio X5 */ | ||
95 | #define ROCKBOXLOGO_WIDTH 160 | ||
96 | #define ROCKBOXLOGO_HEIGHT 50 | ||
97 | |||
98 | #elif (LCD_WIDTH == 176) && (LCD_DEPTH == 16) | ||
99 | /* iPod Nano */ | ||
100 | #define ROCKBOXLOGO_WIDTH 176 | ||
101 | #define ROCKBOXLOGO_HEIGHT 54 | ||
102 | |||
103 | #elif (LCD_WIDTH == 320) && (LCD_DEPTH == 16) | ||
104 | /* iPod Video */ | ||
105 | #define ROCKBOXLOGO_WIDTH 320 | ||
106 | #define ROCKBOXLOGO_HEIGHT 98 | ||
107 | |||
108 | #elif (LCD_WIDTH >= 220) && (LCD_DEPTH == 16) | ||
109 | /* iriver H3x0, iPod Color/Photo */ | ||
110 | #define ROCKBOXLOGO_WIDTH 220 | ||
111 | #define ROCKBOXLOGO_HEIGHT 68 | ||
112 | #endif | ||
113 | |||
114 | #ifdef HAVE_REMOTE_LCD | ||
115 | extern const unsigned char remote_rockboxlogo[]; | ||
116 | #define REMOTE_ROCKBOXLOGO_WIDTH 112 | ||
117 | #define REMOTE_ROCKBOXLOGO_HEIGHT 37 | ||
118 | #endif | ||
119 | |||
120 | #define STATUSBAR_X_POS 0 | 89 | #define STATUSBAR_X_POS 0 |
121 | #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ | 90 | #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ |
122 | #define STATUSBAR_HEIGHT 8 | 91 | #define STATUSBAR_HEIGHT 8 |