From 5c5fef006893f6565685917235c1740dc8c6d29e Mon Sep 17 00:00:00 2001 From: Robert Kukla Date: Mon, 3 Mar 2008 09:28:22 +0000 Subject: m:robe 100: use correct bmp file for chessbox (needs make clean) also use logical and operator in conditions git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16494 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bitmaps/native/SOURCES | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index 40ed6b0da3..b1393cf199 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -119,17 +119,19 @@ bubbles_emblem.112x64x1.bmp #endif /* ChessBox */ -#if (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 240) & (LCD_DEPTH >= 16) +#if (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 240) && (LCD_DEPTH >= 16) chessbox_pieces.240x240x16.bmp -#elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 176) & (LCD_DEPTH >= 16) +#elif (LCD_WIDTH >= 176) && (LCD_HEIGHT >= 176) && (LCD_DEPTH >= 16) chessbox_pieces.176x176x16.bmp -#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) & (LCD_DEPTH > 1) +#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) && (LCD_DEPTH > 1) chessbox_pieces.128x128x2.bmp -#elif (LCD_WIDTH >= 104) && (LCD_HEIGHT >= 104) & (LCD_DEPTH > 1) +#elif (LCD_WIDTH >= 128) && (LCD_HEIGHT >= 128) && (LCD_DEPTH == 1) +chessbox_pieces.128x128x1.bmp +#elif (LCD_WIDTH >= 104) && (LCD_HEIGHT >= 104) && (LCD_DEPTH > 1) chessbox_pieces.104x104x2.bmp -#elif (LCD_WIDTH >= 80) && (LCD_HEIGHT >= 80) & (LCD_DEPTH > 1) +#elif (LCD_WIDTH >= 80) && (LCD_HEIGHT >= 80) && (LCD_DEPTH > 1) chessbox_pieces.80x80x16.bmp -#elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) & (LCD_DEPTH == 1) +#elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) && (LCD_DEPTH == 1) chessbox_pieces.80x64x1.bmp #elif (LCD_WIDTH >= 64) && (LCD_HEIGHT >= 64) chessbox_pieces.64x64x1.bmp -- cgit v1.2.3