diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-06-15 00:21:20 +0200 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-06-21 00:13:58 +0200 |
commit | e49dcbf190b12f8830d7ce057d59d22db8921790 (patch) | |
tree | d5a2cb4f6ff60d277538cc02b935afaf5e383c28 | |
parent | 0267fafc5fd4440ee3d08f22db8c11a2991952da (diff) | |
download | rockbox-e49dcbf190b12f8830d7ce057d59d22db8921790.tar.gz rockbox-e49dcbf190b12f8830d7ce057d59d22db8921790.zip |
bitmaps: Use *x16.bmp also for upcoming 24bit targets (they are actually 24bit BMPs).
Change-Id: I5c7d16ad41e43c26a9ac3e01c52c3ca34a6b7495
-rw-r--r-- | apps/bitmaps/native/SOURCES | 20 | ||||
-rw-r--r-- | apps/plugins/bitmaps/native/SOURCES | 26 |
2 files changed, 23 insertions, 23 deletions
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 | |||
9 | #else | 9 | #else |
10 | rockboxlogo.112x30x1.bmp | 10 | rockboxlogo.112x30x1.bmp |
11 | #endif | 11 | #endif |
12 | #elif (LCD_WIDTH == 96) && (LCD_DEPTH == 16) | 12 | #elif (LCD_WIDTH == 96) && (LCD_DEPTH >= 16) |
13 | rockboxlogo.96x30x16.bmp | 13 | rockboxlogo.96x30x16.bmp |
14 | #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 2) | 14 | #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 2) |
15 | rockboxlogo.128x42x2.bmp | 15 | rockboxlogo.128x42x2.bmp |
16 | #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16) | 16 | #elif (LCD_WIDTH == 128) && (LCD_DEPTH == 16) |
17 | rockboxlogo.128x40x16.bmp | 17 | rockboxlogo.128x40x16.bmp |
18 | #elif (LCD_WIDTH == 132) && (LCD_DEPTH == 16) | 18 | #elif (LCD_WIDTH == 132) && (LCD_DEPTH >= 16) |
19 | rockboxlogo.132x40x16.bmp | 19 | rockboxlogo.132x40x16.bmp |
20 | #elif (LCD_WIDTH == 138) && (LCD_DEPTH == 2) | 20 | #elif (LCD_WIDTH == 138) && (LCD_DEPTH >= 2) |
21 | rockboxlogo.138x46x2.bmp | 21 | rockboxlogo.138x46x2.bmp |
22 | #elif (LCD_WIDTH == 160) && (LCD_DEPTH == 2) | 22 | #elif (LCD_WIDTH == 160) && (LCD_DEPTH == 2) |
23 | rockboxlogo.160x53x2.bmp | 23 | rockboxlogo.160x53x2.bmp |
24 | #elif (LCD_WIDTH == 320) && (LCD_DEPTH == 2) | 24 | #elif (LCD_WIDTH == 320) && (LCD_DEPTH == 2) |
25 | rockboxlogo.160x53x2.bmp | 25 | rockboxlogo.160x53x2.bmp |
26 | #elif (LCD_WIDTH == 160) && (LCD_DEPTH == 16) | 26 | #elif (LCD_WIDTH == 160) && (LCD_DEPTH >= 16) |
27 | rockboxlogo.160x50x16.bmp | 27 | rockboxlogo.160x50x16.bmp |
28 | #elif (LCD_WIDTH == 176) && (LCD_DEPTH == 16) | 28 | #elif (LCD_WIDTH == 176) && (LCD_DEPTH >= 16) |
29 | rockboxlogo.176x54x16.bmp | 29 | rockboxlogo.176x54x16.bmp |
30 | #elif (LCD_WIDTH == 220) && (LCD_DEPTH == 16) | 30 | #elif (LCD_WIDTH == 220) && (LCD_DEPTH >= 16) |
31 | rockboxlogo.220x68x16.bmp | 31 | rockboxlogo.220x68x16.bmp |
32 | #elif (LCD_WIDTH == 240) && (LCD_DEPTH == 16) | 32 | #elif (LCD_WIDTH == 240) && (LCD_DEPTH >= 16) |
33 | rockboxlogo.240x74x16.bmp | 33 | rockboxlogo.240x74x16.bmp |
34 | #elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) && (LCD_DEPTH == 16) | 34 | #elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) && (LCD_DEPTH >= 16) |
35 | rockboxlogo.320x98x16.bmp | 35 | rockboxlogo.320x98x16.bmp |
36 | #elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) && (LCD_DEPTH == 16) | 36 | #elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) && (LCD_DEPTH >= 16) |
37 | rockboxlogo.480x149x16.bmp | 37 | rockboxlogo.480x149x16.bmp |
38 | #elif (LCD_WIDTH >= 640) && (LCD_DEPTH == 16) | 38 | #elif (LCD_WIDTH >= 640) && (LCD_DEPTH >= 16) |
39 | rockboxlogo.640x198x16.bmp | 39 | rockboxlogo.640x198x16.bmp |
40 | #endif | 40 | #endif |
41 | 41 | ||
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 | |||
512 | 512 | ||
513 | 513 | ||
514 | /* Rockblox */ | 514 | /* Rockblox */ |
515 | #if LCD_DEPTH == 16 /* colour versions*/ | 515 | #if LCD_DEPTH >= 16 /* colour versions*/ |
516 | #if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) | 516 | #if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) |
517 | rockblox_background.640x480x16.bmp | 517 | rockblox_background.640x480x16.bmp |
518 | #elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) | 518 | #elif (LCD_WIDTH >= 320) && (LCD_HEIGHT >= 240) |
@@ -755,7 +755,7 @@ sudoku_inverse.112x64x1.bmp | |||
755 | sudoku_start.128x96x2.bmp | 755 | sudoku_start.128x96x2.bmp |
756 | sudoku_normal.128x96x2.bmp | 756 | sudoku_normal.128x96x2.bmp |
757 | sudoku_inverse.128x96x2.bmp | 757 | sudoku_inverse.128x96x2.bmp |
758 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 16) | 758 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH >= 16) |
759 | sudoku_start.128x96x16.bmp | 759 | sudoku_start.128x96x16.bmp |
760 | sudoku_normal.128x96x16.bmp | 760 | sudoku_normal.128x96x16.bmp |
761 | sudoku_inverse.128x96x16.bmp | 761 | sudoku_inverse.128x96x16.bmp |
@@ -775,12 +775,12 @@ sudoku_inverse.132x80x16.bmp | |||
775 | sudoku_start.96x70x14.bmp | 775 | sudoku_start.96x70x14.bmp |
776 | sudoku_normal.96x70x14.bmp | 776 | sudoku_normal.96x70x14.bmp |
777 | sudoku_inverse.96x70x14.bmp | 777 | sudoku_inverse.96x70x14.bmp |
778 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16) | 778 | #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16) |
779 | sudoku_start.128x128x16.bmp | 779 | sudoku_start.128x128x16.bmp |
780 | sudoku_normal.128x128x16.bmp | 780 | sudoku_normal.128x128x16.bmp |
781 | sudoku_inverse.128x128x16.bmp | 781 | sudoku_inverse.128x128x16.bmp |
782 | #elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)) || \ | 782 | #elif ((LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16)) || \ |
783 | ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16)) | 783 | ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH >= 16)) |
784 | sudoku_start.160x128x16.bmp | 784 | sudoku_start.160x128x16.bmp |
785 | sudoku_normal.160x128x16.bmp | 785 | sudoku_normal.160x128x16.bmp |
786 | sudoku_inverse.160x128x16.bmp | 786 | sudoku_inverse.160x128x16.bmp |
@@ -792,7 +792,7 @@ sudoku_inverse.160x128x2.bmp | |||
792 | sudoku_start.160x128x1.bmp | 792 | sudoku_start.160x128x1.bmp |
793 | sudoku_normal.160x128x1.bmp | 793 | sudoku_normal.160x128x1.bmp |
794 | sudoku_inverse.160x128x1.bmp | 794 | sudoku_inverse.160x128x1.bmp |
795 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) && (LCD_DEPTH == 16) | 795 | #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) && (LCD_DEPTH >= 16) |
796 | sudoku_start.220x176x16.bmp | 796 | sudoku_start.220x176x16.bmp |
797 | sudoku_normal.220x176x16.bmp | 797 | sudoku_normal.220x176x16.bmp |
798 | sudoku_inverse.220x176x16.bmp | 798 | sudoku_inverse.220x176x16.bmp |
@@ -801,25 +801,25 @@ sudoku_inverse.220x176x16.bmp | |||
801 | sudoku_start.320x240x16.bmp | 801 | sudoku_start.320x240x16.bmp |
802 | sudoku_normal.320x240x16.bmp | 802 | sudoku_normal.320x240x16.bmp |
803 | sudoku_inverse.320x240x16.bmp | 803 | sudoku_inverse.320x240x16.bmp |
804 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH == 16) | 804 | #elif (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH >= 16) |
805 | sudoku_start.320x240x16.bmp | 805 | sudoku_start.320x240x16.bmp |
806 | sudoku_normal.320x240x16.bmp | 806 | sudoku_normal.320x240x16.bmp |
807 | sudoku_inverse.320x240x16.bmp | 807 | sudoku_inverse.320x240x16.bmp |
808 | #elif (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) && (LCD_DEPTH == 16) | 808 | #elif (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) && (LCD_DEPTH >= 16) |
809 | sudoku_start.640x480x16.bmp | 809 | sudoku_start.640x480x16.bmp |
810 | sudoku_normal.640x480x16.bmp | 810 | sudoku_normal.640x480x16.bmp |
811 | sudoku_inverse.640x480x16.bmp | 811 | sudoku_inverse.640x480x16.bmp |
812 | #endif | 812 | #endif |
813 | #else /* LCD_WIDTH < LCD_HEIGHT */ | 813 | #else /* LCD_WIDTH < LCD_HEIGHT */ |
814 | #if ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160) && (LCD_DEPTH == 16)) | 814 | #if ((LCD_WIDTH == 128) && (LCD_HEIGHT == 160) && (LCD_DEPTH >= 16)) |
815 | sudoku_start.128x128x16.bmp | 815 | sudoku_start.128x128x16.bmp |
816 | sudoku_normal.128x128x16.bmp | 816 | sudoku_normal.128x128x16.bmp |
817 | sudoku_inverse.128x128x16.bmp | 817 | sudoku_inverse.128x128x16.bmp |
818 | #elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16)) | 818 | #elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH >= 16)) |
819 | sudoku_start.220x176x16.bmp | 819 | sudoku_start.220x176x16.bmp |
820 | sudoku_normal.220x176x16.bmp | 820 | sudoku_normal.220x176x16.bmp |
821 | sudoku_inverse.220x176x16.bmp | 821 | sudoku_inverse.220x176x16.bmp |
822 | #elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) && (LCD_DEPTH == 16) | 822 | #elif (LCD_WIDTH >= 240) && (LCD_HEIGHT >= 320) && (LCD_DEPTH >= 16) |
823 | sudoku_start.320x240x16.bmp | 823 | sudoku_start.320x240x16.bmp |
824 | sudoku_normal.320x240x16.bmp | 824 | sudoku_normal.320x240x16.bmp |
825 | sudoku_inverse.320x240x16.bmp | 825 | sudoku_inverse.320x240x16.bmp |
@@ -827,7 +827,7 @@ sudoku_inverse.320x240x16.bmp | |||
827 | #endif | 827 | #endif |
828 | 828 | ||
829 | /* Superdom */ | 829 | /* Superdom */ |
830 | #if LCD_DEPTH == 16 | 830 | #if LCD_DEPTH >= 16 |
831 | #if ((LCD_WIDTH == 220) && (LCD_HEIGHT == 176)) | 831 | #if ((LCD_WIDTH == 220) && (LCD_HEIGHT == 176)) |
832 | superdom_boarditems.220x176x16.bmp | 832 | superdom_boarditems.220x176x16.bmp |
833 | #elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132)) || \ | 833 | #elif ((LCD_WIDTH == 176) && (LCD_HEIGHT == 132)) || \ |
@@ -888,7 +888,7 @@ sliding_puzzle.80x64x1.bmp | |||
888 | #endif | 888 | #endif |
889 | 889 | ||
890 | /* Logo */ | 890 | /* Logo */ |
891 | #if LCD_DEPTH == 16 | 891 | #if LCD_DEPTH >= 16 |
892 | #if (LCD_WIDTH >= 320) | 892 | #if (LCD_WIDTH >= 320) |
893 | rockboxlogo.220x68x16.bmp | 893 | rockboxlogo.220x68x16.bmp |
894 | #elif (LCD_WIDTH > 160) | 894 | #elif (LCD_WIDTH > 160) |