summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/bitmaps/mono/SOURCES3
-rw-r--r--apps/plugins/bitmaps/native/SOURCES14
-rw-r--r--apps/plugins/bubbles.c2
-rw-r--r--apps/plugins/wormlet.c3
-rwxr-xr-xtools/configure2
5 files changed, 17 insertions, 7 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index 813ede362c..c12c7c7d67 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -10,7 +10,8 @@ bubbles_bubble.132x80x16.bmp
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
bubbles_bubble.128x96x1.bmp
#elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \
- ((LCD_WIDTH == 128) && (LCD_HEIGHT == 128))
+ ((LCD_WIDTH == 128) && (LCD_HEIGHT == 128)) || \
+ ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160))
bubbles_bubble.160x128x1.bmp
#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132)
bubbles_bubble.160x128x1.bmp
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 598f75975a..f655f59648 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -381,6 +381,8 @@ jewels.112x64x1.bmp
jewels.112x64x1.bmp
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128)
jewels.128x128x16.bmp
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 160)
+jewels.128x128x16.bmp
#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
jewels.132x80x16.bmp
#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
@@ -490,7 +492,7 @@ rockblox_background.176x220x16.bmp
rockblox_background.176x132x16.bmp
#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
rockblox_background.160x128x16.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128)
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT >= 128)
rockblox_background.128x128x16.bmp
#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
rockblox_background.132x80x16.bmp
@@ -720,7 +722,7 @@ sudoku_inverse.138x110x2.bmp
sudoku_start.132x80x16.bmp
sudoku_normal.132x80x16.bmp
sudoku_inverse.132x80x16.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)
+#elif ((LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)) ||
sudoku_start.128x128x16.bmp
sudoku_normal.128x128x16.bmp
sudoku_inverse.128x128x16.bmp
@@ -755,8 +757,12 @@ sudoku_start.640x480x16.bmp
sudoku_normal.640x480x16.bmp
sudoku_inverse.640x480x16.bmp
#endif
-#else
-#if ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16))
+#else /* LCD_WIDTH < LCD_HEIGHT */
+#if ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160) && (LCD_DEPTH == 16))
+sudoku_start.128x128x16.bmp
+sudoku_normal.128x128x16.bmp
+sudoku_inverse.128x128x16.bmp
+#elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16))
sudoku_start.220x176x16.bmp
sudoku_normal.220x176x16.bmp
sudoku_inverse.220x176x16.bmp
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index b35807de47..57e29ede04 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -205,7 +205,9 @@ enum {
#define ROW_HEIGHT (BUBBLE_WIDTH-(BUBBLE_WIDTH-EMBLEM_WIDTH)/2)
#endif
+#if !defined(ROW_INDENT)
#define ROW_INDENT (BUBBLE_WIDTH/2)
+#endif
#define TEXT_LINES (LCD_HEIGHT/8)
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 3d24f7fa19..e2076f75bd 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -358,7 +358,8 @@ CONFIG_KEYPAD == MROBE500_PAD
#define ARGH_SIZE 5
#define SPEED 9
#define MAX_WORM_SEGMENTS 128
-#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
+#elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128)) || \
+ ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160))
#define FOOD_SIZE 4
#define ARGH_SIZE 5
#define SPEED 8
diff --git a/tools/configure b/tools/configure
index 7e53cd4047..6a7eaeb28d 100755
--- a/tools/configure
+++ b/tools/configure
@@ -2346,7 +2346,7 @@ fi
bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
output="rockbox.mi4"
appextra="recorder:gui:radio"
- plugins=""
+ plugins="yes"
swcodec="yes"
boottool="$rootdir/tools/scramble -mi4v3 -model=9200 -type=RBBL"
bootoutput="FWImage.ebn"