From e49dcbf190b12f8830d7ce057d59d22db8921790 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 15 Jun 2014 00:21:20 +0200 Subject: bitmaps: Use *x16.bmp also for upcoming 24bit targets (they are actually 24bit BMPs). Change-Id: I5c7d16ad41e43c26a9ac3e01c52c3ca34a6b7495 --- apps/bitmaps/native/SOURCES | 20 ++++++++++---------- apps/plugins/bitmaps/native/SOURCES | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'apps') diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index 9479f3e933..88a571bdbd 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES @@ -9,33 +9,33 @@ rockboxlogo.128x42x1.bmp #else rockboxlogo.112x30x1.bmp #endif -#elif (LCD_WIDTH == 96) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 96) && (LCD_DEPTH >= 16) rockboxlogo.96x30x16.bmp #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 2) rockboxlogo.128x42x2.bmp #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16) rockboxlogo.128x40x16.bmp -#elif (LCD_WIDTH == 132) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 132) && (LCD_DEPTH >= 16) rockboxlogo.132x40x16.bmp -#elif (LCD_WIDTH == 138) && (LCD_DEPTH == 2) +#elif (LCD_WIDTH == 138) && (LCD_DEPTH >= 2) rockboxlogo.138x46x2.bmp #elif (LCD_WIDTH == 160) && (LCD_DEPTH == 2) rockboxlogo.160x53x2.bmp #elif (LCD_WIDTH == 320) && (LCD_DEPTH == 2) rockboxlogo.160x53x2.bmp -#elif (LCD_WIDTH == 160) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 160) && (LCD_DEPTH >= 16) rockboxlogo.160x50x16.bmp -#elif (LCD_WIDTH == 176) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 176) && (LCD_DEPTH >= 16) rockboxlogo.176x54x16.bmp -#elif (LCD_WIDTH == 220) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 220) && (LCD_DEPTH >= 16) rockboxlogo.220x68x16.bmp -#elif (LCD_WIDTH == 240) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 240) && (LCD_DEPTH >= 16) rockboxlogo.240x74x16.bmp -#elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) && (LCD_DEPTH >= 16) rockboxlogo.320x98x16.bmp -#elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) && (LCD_DEPTH >= 16) rockboxlogo.480x149x16.bmp -#elif (LCD_WIDTH >= 640) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH >= 640) && (LCD_DEPTH >= 16) rockboxlogo.640x198x16.bmp #endif diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 6197f168e7..4b7f0e2670 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -512,7 +512,7 @@ pegbox_pieces.9x7x1.bmp /* Rockblox */ -#if LCD_DEPTH == 16 /* colour versions*/ +#if LCD_DEPTH >= 16 /* colour versions*/ #if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) rockblox_background.640x480x16.bmp #elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) @@ -755,7 +755,7 @@ sudoku_inverse.112x64x1.bmp sudoku_start.128x96x2.bmp sudoku_normal.128x96x2.bmp sudoku_inverse.128x96x2.bmp -#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH >= 16) sudoku_start.128x96x16.bmp sudoku_normal.128x96x16.bmp sudoku_inverse.128x96x16.bmp @@ -775,12 +775,12 @@ sudoku_inverse.132x80x16.bmp sudoku_start.96x70x14.bmp sudoku_normal.96x70x14.bmp sudoku_inverse.96x70x14.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 -#elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)) || \ - ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16)) +#elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16)) || \ + ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH >= 16)) sudoku_start.160x128x16.bmp sudoku_normal.160x128x16.bmp sudoku_inverse.160x128x16.bmp @@ -792,7 +792,7 @@ sudoku_inverse.160x128x2.bmp sudoku_start.160x128x1.bmp sudoku_normal.160x128x1.bmp sudoku_inverse.160x128x1.bmp -#elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) && (LCD_DEPTH >= 16) sudoku_start.220x176x16.bmp sudoku_normal.220x176x16.bmp sudoku_inverse.220x176x16.bmp @@ -801,25 +801,25 @@ sudoku_inverse.220x176x16.bmp sudoku_start.320x240x16.bmp sudoku_normal.320x240x16.bmp sudoku_inverse.320x240x16.bmp -#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH >= 16) sudoku_start.320x240x16.bmp sudoku_normal.320x240x16.bmp sudoku_inverse.320x240x16.bmp -#elif (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) && (LCD_DEPTH >= 16) sudoku_start.640x480x16.bmp sudoku_normal.640x480x16.bmp sudoku_inverse.640x480x16.bmp #endif #else /* LCD_WIDTH < LCD_HEIGHT */ -#if ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160) && (LCD_DEPTH == 16)) +#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)) +#elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH >= 16)) sudoku_start.220x176x16.bmp sudoku_normal.220x176x16.bmp sudoku_inverse.220x176x16.bmp -#elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) && (LCD_DEPTH == 16) +#elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) && (LCD_DEPTH >= 16) sudoku_start.320x240x16.bmp sudoku_normal.320x240x16.bmp sudoku_inverse.320x240x16.bmp @@ -827,7 +827,7 @@ sudoku_inverse.320x240x16.bmp #endif /* Superdom */ -#if LCD_DEPTH == 16 +#if LCD_DEPTH >= 16 #if ((LCD_WIDTH == 220) && (LCD_HEIGHT == 176)) superdom_boarditems.220x176x16.bmp #elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132)) || \ @@ -888,7 +888,7 @@ sliding_puzzle.80x64x1.bmp #endif /* Logo */ -#if LCD_DEPTH == 16 +#if LCD_DEPTH >= 16 #if (LCD_WIDTH >= 320) rockboxlogo.220x68x16.bmp #elif (LCD_WIDTH > 160) -- cgit v1.2.3