diff -Naur ./rockbox.unmod/apps/plugins/bitmaps/native/SOURCES ./rockbox.mod/apps/plugins/bitmaps/native/SOURCES --- ./rockbox.unmod/apps/plugins/bitmaps/native/SOURCES 2011-01-22 09:02:13.000000000 -0600 +++ ./rockbox.mod/apps/plugins/bitmaps/native/SOURCES 2011-01-23 19:28:11.000000000 -0600 @@ -325,13 +325,13 @@ invadrox_ufo.46x20x16.bmp invadrox_ufo_explode.61x23x16.bmp invadrox_numbers.140x19x16.bmp -#if LCD_WIDTH == 480 +#if (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) invadrox_background.480x640x16.bmp -#elif LCD_WIDTH == 640 +#elif LCD_WIDTH >= 640 invadrox_background.640x480x16.bmp #endif -#elif LCD_WIDTH >= 220 +#elif (LCD_WIDTH >= 220) && (LCD_WIDTH < 640) invadrox_aliens.24x24x16.bmp invadrox_alien_explode.13x7x16.bmp invadrox_ships.16x24x16.bmp @@ -340,11 +340,11 @@ invadrox_ufo.16x7x16.bmp invadrox_ufo_explode.21x8x16.bmp invadrox_numbers.50x7x16.bmp -#if LCD_WIDTH == 320 +#if LCD_WIDTH >= 320 invadrox_background.320x240x16.bmp -#elif LCD_WIDTH == 240 +#elif (LCD_WIDTH >= 240) && (LCD_WIDTH < 320) invadrox_background.240x320x16.bmp -#elif LCD_WIDTH == 220 +#elif (LCD_WIDTH >= 220) && (LCD_WIDTH < 240) invadrox_background.220x176x16.bmp #endif @@ -402,13 +402,12 @@ jewels.220x176x16.bmp #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) jewels.220x176x16.bmp -#elif (LCD_WIDTH == 240) && (LCD_HEIGHT >= 320) -jewels.320x240x16.bmp -#elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) +#elif (LCD_WIDTH >= 240) && (LCD_WIDTH <= 479) jewels.320x240x16.bmp -#elif ((LCD_WIDTH == 640) && (LCD_HEIGHT == 480)) || \ - ((LCD_WIDTH == 480) && (LCD_HEIGHT == 640)) +#elif (LCD_WIDTH >= 480) jewels.640x480x16.bmp +#else +#error JEWELS - No jewels.xxx.bmp avalible! #endif /* Minesweeper */ @@ -481,11 +480,11 @@ /* Rockblox */ #if LCD_DEPTH == 16 /* colour versions*/ -#if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) +#if LCD_WIDTH >= 480 rockblox_background.640x480x16.bmp -#elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) +#elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) rockblox_background.320x240x16.bmp -#elif (LCD_WIDTH == 240) && (LCD_HEIGHT >= 320) +#elif (LCD_WIDTH >= 240) && (LCD_WIDTH < 320) rockblox_background.240x320x16.bmp #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) rockblox_background.220x176x16.bmp @@ -753,11 +752,11 @@ 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_WIDTH <= 639) && (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_DEPTH == 16) sudoku_start.640x480x16.bmp sudoku_normal.640x480x16.bmp sudoku_inverse.640x480x16.bmp @@ -791,9 +790,9 @@ #elif ((LCD_WIDTH == 240) && (LCD_HEIGHT == 320)) || \ ((LCD_WIDTH == 240) && (LCD_HEIGHT == 400)) superdom_boarditems.240x320x16.bmp -#elif (LCD_WIDTH == 480 && LCD_HEIGHT == 640) +#elif (LCD_WIDTH >= 480 && LCD_WIDTH <= 640) superdom_boarditems.480x640x16.bmp -#elif (LCD_WIDTH == 640 && LCD_HEIGHT == 480) +#else superdom_boarditems.640x480x16.bmp #endif #endif @@ -824,9 +823,10 @@ sliding_puzzle.176x176x16.bmp #elif SMALLER_DIMENSION <= 240 sliding_puzzle.240x240x16.bmp -#elif SMALLER_DIMENSION <= 480 +#else sliding_puzzle.480x480x16.bmp #endif + #elif (LCD_DEPTH > 1) #if SMALLER_DIMENSION <= 96 sliding_puzzle.96x96x2.bmp @@ -835,6 +835,7 @@ #elif SMALLER_DIMENSION <= 128 sliding_puzzle.128x128x2.bmp #endif + #else /* mono targets, one size currently */ sliding_puzzle.80x64x1.bmp #endif