diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-02 20:28:20 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2011-12-02 20:28:20 +0000 |
commit | bd691efae9e73d6e5a09c70246c9b1e2574b50be (patch) | |
tree | a9f9cb6bc140ec6001aa264d5762740da2831799 | |
parent | 444b17626fc8e1ed7dee23252d3bd0fe5d0020f9 (diff) | |
download | rockbox-bd691efae9e73d6e5a09c70246c9b1e2574b50be.tar.gz rockbox-bd691efae9e73d6e5a09c70246c9b1e2574b50be.zip |
Sansa Clip Zip: enable all plugins
use too big graphics when needed (some plugins will be ugly)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31113 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/bitmaps/mono/SOURCES | 2 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 15 | ||||
-rw-r--r-- | apps/plugins/bubbles.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 13 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 2 | ||||
-rwxr-xr-x | tools/configure | 2 |
6 files changed, 26 insertions, 10 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES index c12c7c7d67..df1397d2e2 100644 --- a/apps/plugins/bitmaps/mono/SOURCES +++ b/apps/plugins/bitmaps/mono/SOURCES | |||
@@ -5,7 +5,7 @@ | |||
5 | bubbles_bubble.112x64x1.bmp | 5 | bubbles_bubble.112x64x1.bmp |
6 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) | 6 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) |
7 | bubbles_bubble.128x64x1.bmp | 7 | bubbles_bubble.128x64x1.bmp |
8 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) | 8 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96) |
9 | bubbles_bubble.132x80x16.bmp | 9 | bubbles_bubble.132x80x16.bmp |
10 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | 10 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) |
11 | bubbles_bubble.128x96x1.bmp | 11 | bubbles_bubble.128x96x1.bmp |
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 8eaf623fda..7ea9e2918f 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES | |||
@@ -76,7 +76,7 @@ brickmania_long_pads.132x80x16.bmp | |||
76 | brickmania_powerups.132x80x16.bmp | 76 | brickmania_powerups.132x80x16.bmp |
77 | brickmania_break.132x80x16.bmp | 77 | brickmania_break.132x80x16.bmp |
78 | 78 | ||
79 | #elif LCD_WIDTH >= 128 | 79 | #elif LCD_WIDTH >= 96 |
80 | brickmania_ball.4x4x16.bmp | 80 | brickmania_ball.4x4x16.bmp |
81 | brickmania_bricks.128x128x16.bmp | 81 | brickmania_bricks.128x128x16.bmp |
82 | brickmania_pads.132x80x16.bmp | 82 | brickmania_pads.132x80x16.bmp |
@@ -84,6 +84,7 @@ brickmania_short_pads.132x80x16.bmp | |||
84 | brickmania_long_pads.132x80x16.bmp | 84 | brickmania_long_pads.132x80x16.bmp |
85 | brickmania_powerups.132x80x16.bmp | 85 | brickmania_powerups.132x80x16.bmp |
86 | brickmania_break.132x80x16.bmp | 86 | brickmania_break.132x80x16.bmp |
87 | |||
87 | #endif /* different colour displays */ | 88 | #endif /* different colour displays */ |
88 | 89 | ||
89 | #elif LCD_DEPTH > 1 | 90 | #elif LCD_DEPTH > 1 |
@@ -148,7 +149,7 @@ bubbles_background.128x128x16.bmp | |||
148 | #elif (LCD_WIDTH >= 132) && (LCD_HEIGHT >= 80) | 149 | #elif (LCD_WIDTH >= 132) && (LCD_HEIGHT >= 80) |
149 | bubbles_emblem.132x80x16.bmp | 150 | bubbles_emblem.132x80x16.bmp |
150 | bubbles_background.132x80x16.bmp | 151 | bubbles_background.132x80x16.bmp |
151 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 96) | 152 | #elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96) |
152 | bubbles_emblem.132x80x16.bmp | 153 | bubbles_emblem.132x80x16.bmp |
153 | bubbles_background.128x96x16.bmp | 154 | bubbles_background.128x96x16.bmp |
154 | #endif | 155 | #endif |
@@ -262,7 +263,7 @@ clock_segments.128x128x2.bmp | |||
262 | clock_smallsegments.128x128x2.bmp | 263 | clock_smallsegments.128x128x2.bmp |
263 | clock_logo.128x128x2.bmp | 264 | clock_logo.128x128x2.bmp |
264 | clock_messages.128x128x2.bmp | 265 | clock_messages.128x128x2.bmp |
265 | #elif (LCD_WIDTH >= 112) && (LCD_HEIGHT >= 64) && (LCD_DEPTH >= 1) | 266 | #elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 64) && (LCD_DEPTH >= 1) |
266 | clock_binary.112x64x1.bmp | 267 | clock_binary.112x64x1.bmp |
267 | clock_digits.112x64x1.bmp | 268 | clock_digits.112x64x1.bmp |
268 | clock_smalldigits.112x64x1.bmp | 269 | clock_smalldigits.112x64x1.bmp |
@@ -505,7 +506,7 @@ rockblox_background.128x160x16.bmp | |||
505 | rockblox_background.128x128x16.bmp | 506 | rockblox_background.128x128x16.bmp |
506 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) | 507 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) |
507 | rockblox_background.132x80x16.bmp | 508 | rockblox_background.132x80x16.bmp |
508 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) | 509 | #elif ((LCD_WIDTH == 128 && LCD_HEIGHT == 96) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)) |
509 | rockblox_background.128x96x2.bmp | 510 | rockblox_background.128x96x2.bmp |
510 | #endif | 511 | #endif |
511 | #elif LCD_DEPTH == 2 /* greyscale versions */ | 512 | #elif LCD_DEPTH == 2 /* greyscale versions */ |
@@ -647,7 +648,7 @@ solitaire_suitsi.26x132x16.bmp | |||
647 | card_back.18x23x16.bmp | 648 | card_back.18x23x16.bmp |
648 | card_deck.234x92x16.bmp | 649 | card_deck.234x92x16.bmp |
649 | solitaire_suitsi.18x92x16.bmp | 650 | solitaire_suitsi.18x92x16.bmp |
650 | #elif LCD_WIDTH >= 128 | 651 | #elif LCD_WIDTH >= 96 |
651 | card_back.15x20x16.bmp | 652 | card_back.15x20x16.bmp |
652 | card_deck.195x80x16.bmp | 653 | card_deck.195x80x16.bmp |
653 | solitaire_suitsi.15x80x16.bmp | 654 | solitaire_suitsi.15x80x16.bmp |
@@ -729,7 +730,7 @@ sudoku_inverse.128x128x2.bmp | |||
729 | sudoku_start.138x110x2.bmp | 730 | sudoku_start.138x110x2.bmp |
730 | sudoku_normal.138x110x2.bmp | 731 | sudoku_normal.138x110x2.bmp |
731 | sudoku_inverse.138x110x2.bmp | 732 | sudoku_inverse.138x110x2.bmp |
732 | #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) && (LCD_DEPTH >= 16) | 733 | #elif ((LCD_WIDTH == 132 && LCD_HEIGHT == 80) || (LCD_WIDTH == 96 && LCD_HEIGHT == 96)) && (LCD_DEPTH >= 16) |
733 | sudoku_start.132x80x16.bmp | 734 | sudoku_start.132x80x16.bmp |
734 | sudoku_normal.132x80x16.bmp | 735 | sudoku_normal.132x80x16.bmp |
735 | sudoku_inverse.132x80x16.bmp | 736 | sudoku_inverse.132x80x16.bmp |
@@ -898,6 +899,8 @@ pitch_notes.128x128x2.bmp | |||
898 | pitch_notes.128x96x2.bmp | 899 | pitch_notes.128x96x2.bmp |
899 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64) | 900 | #elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 64) |
900 | pitch_notes.128x64x1.bmp | 901 | pitch_notes.128x64x1.bmp |
902 | #elif (LCD_WIDTH >= 96) && (LCD_HEIGHT >= 96) | ||
903 | pitch_notes.132x80x16.bmp | ||
901 | #else | 904 | #else |
902 | #error Pitch Detector: unsupported LCD | 905 | #error Pitch Detector: unsupported LCD |
903 | #endif | 906 | #endif |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 1c4bbca788..9f860d43ee 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -198,7 +198,7 @@ enum { | |||
198 | #define MAX_FPS 30 | 198 | #define MAX_FPS 30 |
199 | 199 | ||
200 | /* 7x7 bubbles (Sansa Clip/m200) */ | 200 | /* 7x7 bubbles (Sansa Clip/m200) */ |
201 | #elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) | 201 | #elif (LCD_HEIGHT == 64 && LCD_WIDTH == 128) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96) |
202 | #define XOFS 33 | 202 | #define XOFS 33 |
203 | #define ROW_HEIGHT 5 | 203 | #define ROW_HEIGHT 5 |
204 | #define MAX_FPS 30 | 204 | #define MAX_FPS 30 |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 7097704742..674b14ed83 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -630,6 +630,19 @@ | |||
630 | #define LEVEL_X 78 | 630 | #define LEVEL_X 78 |
631 | #define LINES_Y 51 | 631 | #define LINES_Y 51 |
632 | 632 | ||
633 | #elif LCD_WIDTH == 96 && LCD_HEIGHT == 96 | ||
634 | |||
635 | #define BLOCK_WIDTH 3 | ||
636 | #define BLOCK_HEIGHT 3 | ||
637 | #define BOARD_X 9 | ||
638 | #define BOARD_Y 3 | ||
639 | #define PREVIEW_X 59 | ||
640 | #define PREVIEW_Y 5 | ||
641 | #define LABEL_X 59 | ||
642 | #define SCORE_Y 32 | ||
643 | #define LEVEL_Y 13 | ||
644 | #define LEVEL_X 78 | ||
645 | #define LINES_Y 51 | ||
633 | #endif | 646 | #endif |
634 | 647 | ||
635 | #ifndef LEVEL_X | 648 | #ifndef LEVEL_X |
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index f0bff4d2a4..73c18708d2 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -99,7 +99,7 @@ static const char default_game[9][9] = | |||
99 | 99 | ||
100 | #if LCD_HEIGHT <= LCD_WIDTH /* Horizontal layout, scratchpad at the left */ | 100 | #if LCD_HEIGHT <= LCD_WIDTH /* Horizontal layout, scratchpad at the left */ |
101 | 101 | ||
102 | #if (LCD_HEIGHT==64) && (LCD_WIDTH==112 || LCD_WIDTH==128) | 102 | #if ((LCD_HEIGHT==64 && (LCD_WIDTH==112 || LCD_WIDTH==128)) || (LCD_HEIGHT == 96 && LCD_WIDTH == 96)) |
103 | /* Archos Recorders and Ondios - 112x64, 9 cells @ 8x6 with 10 border lines */ | 103 | /* Archos Recorders and Ondios - 112x64, 9 cells @ 8x6 with 10 border lines */ |
104 | #define SMALL_BOARD | 104 | #define SMALL_BOARD |
105 | #define MARK_OFFS 1 /* Pixels between border and mark */ | 105 | #define MARK_OFFS 1 /* Pixels between border and mark */ |
diff --git a/tools/configure b/tools/configure index 8a622af7e7..80c638013f 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -2541,7 +2541,7 @@ fi | |||
2541 | output="rockbox.sansa" | 2541 | output="rockbox.sansa" |
2542 | bootoutput="bootloader-clipzip.sansa" | 2542 | bootoutput="bootloader-clipzip.sansa" |
2543 | appextra="recorder:gui:radio" | 2543 | appextra="recorder:gui:radio" |
2544 | plugins="" | 2544 | plugins="yes" |
2545 | swcodec="yes" | 2545 | swcodec="yes" |
2546 | toolset=$scramblebitmaptools | 2546 | toolset=$scramblebitmaptools |
2547 | t_cpu="arm" | 2547 | t_cpu="arm" |