diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-25 19:00:58 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-08-25 19:00:58 +0000 |
commit | 7014faee69119b832451a136c25e63722100b85e (patch) | |
tree | a31c20e5dcb920761924aa57a7507d8c33959ea4 | |
parent | b11767b7ae883f48e9020a7b137ddba5360d31af (diff) | |
download | rockbox-7014faee69119b832451a136c25e63722100b85e.tar.gz rockbox-7014faee69119b832451a136c25e63722100b85e.zip |
Remove build conditions inside .c plugin files
Rather use the Makefile to specify which files must be built
Fix color builds with test plugins enabled (test_scanrate gave an empty
.o file)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27886 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SOURCES | 16 | ||||
-rw-r--r-- | apps/plugins/alpine_cdc.c | 7 | ||||
-rw-r--r-- | apps/plugins/bubbles.c | 4 | ||||
-rw-r--r-- | apps/plugins/calculator.c | 4 | ||||
-rw-r--r-- | apps/plugins/demystify.c | 3 | ||||
-rw-r--r-- | apps/plugins/euroconverter.c | 4 | ||||
-rw-r--r-- | apps/plugins/fire.c | 3 | ||||
-rw-r--r-- | apps/plugins/iriver_flash.c | 12 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 6 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 4 | ||||
-rw-r--r-- | apps/plugins/nim.c | 3 | ||||
-rw-r--r-- | apps/plugins/oscilloscope.c | 2 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 4 | ||||
-rw-r--r-- | apps/plugins/pong.c | 6 | ||||
-rw-r--r-- | apps/plugins/ppmviewer.c | 6 | ||||
-rw-r--r-- | apps/plugins/rockblox1d.c | 6 | ||||
-rw-r--r-- | apps/plugins/rockbox_flash.c | 7 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 5 | ||||
-rw-r--r-- | apps/plugins/snake.c | 3 | ||||
-rw-r--r-- | apps/plugins/snake2.c | 4 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 6 | ||||
-rw-r--r-- | apps/plugins/star.c | 4 | ||||
-rw-r--r-- | apps/plugins/starfield.c | 6 | ||||
-rw-r--r-- | apps/plugins/test_fps.c | 3 | ||||
-rw-r--r-- | apps/plugins/test_scanrate.c | 6 |
25 files changed, 15 insertions, 119 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 8ecb2fbd8a..24895fe33f 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -150,10 +150,6 @@ robotfindskitten.c | |||
150 | xobox.c | 150 | xobox.c |
151 | spacerocks.c | 151 | spacerocks.c |
152 | 152 | ||
153 | /* Plugins needing the grayscale lib on low-depth LCDs */ | ||
154 | fire.c | ||
155 | plasma.c | ||
156 | |||
157 | blackjack.c | 153 | blackjack.c |
158 | bounce.c | 154 | bounce.c |
159 | bubbles.c | 155 | bubbles.c |
@@ -176,6 +172,10 @@ starfield.c | |||
176 | vu_meter.c | 172 | vu_meter.c |
177 | wormlet.c | 173 | wormlet.c |
178 | 174 | ||
175 | /* Plugins needing the grayscale lib on low-depth LCDs */ | ||
176 | fire.c | ||
177 | plasma.c | ||
178 | |||
179 | #ifdef HAVE_LCD_COLOR | 179 | #ifdef HAVE_LCD_COLOR |
180 | clix.c | 180 | clix.c |
181 | ppmviewer.c | 181 | ppmviewer.c |
@@ -225,9 +225,12 @@ test_codec.c | |||
225 | test_core_jpeg.c | 225 | test_core_jpeg.c |
226 | #endif | 226 | #endif |
227 | test_disk.c | 227 | test_disk.c |
228 | test_fps.c | ||
229 | #ifdef HAVE_LCD_BITMAP | 228 | #ifdef HAVE_LCD_BITMAP |
229 | test_fps.c | ||
230 | test_gfx.c | 230 | test_gfx.c |
231 | #if LCD_DEPTH < 4 && !defined(SIMULATOR) | ||
232 | test_scanrate.c | ||
233 | #endif | ||
231 | #ifndef HAVE_LCD_COLOR | 234 | #ifndef HAVE_LCD_COLOR |
232 | test_grey.c | 235 | test_grey.c |
233 | test_greylib_bitmap_scale.c | 236 | test_greylib_bitmap_scale.c |
@@ -243,9 +246,8 @@ test_resize.c | |||
243 | #if CONFIG_CODEC == SWCODEC | 246 | #if CONFIG_CODEC == SWCODEC |
244 | test_sampr.c | 247 | test_sampr.c |
245 | #endif | 248 | #endif |
246 | test_scanrate.c | ||
247 | #ifdef HAVE_TOUCHSCREEN | 249 | #ifdef HAVE_TOUCHSCREEN |
248 | test_touchscreen.c | 250 | test_touchscreen.c |
249 | #endif | 251 | #endif |
250 | test_viewports.c | 252 | test_viewports.c |
251 | #endif | 253 | #endif /* HAVE_TEST_PLUGINS */ |
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index f6b236895d..3290d5e851 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -33,11 +33,6 @@ | |||
33 | 33 | ||
34 | #include "plugin.h" | 34 | #include "plugin.h" |
35 | 35 | ||
36 | /* Only build for (correct) target */ | ||
37 | #if CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC) | ||
38 | |||
39 | |||
40 | |||
41 | #ifdef HAVE_LCD_CHARCELLS /* player model */ | 36 | #ifdef HAVE_LCD_CHARCELLS /* player model */ |
42 | #define LINES 2 | 37 | #define LINES 2 |
43 | #define COLUMNS 11 | 38 | #define COLUMNS 11 |
@@ -1198,5 +1193,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1198 | /* now go ahead and have fun! */ | 1193 | /* now go ahead and have fun! */ |
1199 | return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR; | 1194 | return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR; |
1200 | } | 1195 | } |
1201 | |||
1202 | #endif /* CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC) */ | ||
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 320fd3e4c6..b35807de47 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -23,8 +23,6 @@ | |||
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | #ifdef HAVE_LCD_BITMAP | ||
27 | |||
28 | #include "lib/xlcd.h" | 26 | #include "lib/xlcd.h" |
29 | #include "lib/pluginlib_actions.h" | 27 | #include "lib/pluginlib_actions.h" |
30 | #include "lib/fixedpoint.h" | 28 | #include "lib/fixedpoint.h" |
@@ -2566,5 +2564,3 @@ enum plugin_status plugin_start(const void* parameter) { | |||
2566 | rb->lcd_setfont(FONT_UI); | 2564 | rb->lcd_setfont(FONT_UI); |
2567 | return ret; | 2565 | return ret; |
2568 | } | 2566 | } |
2569 | |||
2570 | #endif | ||
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 8068b9c4f3..148f149726 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -75,7 +75,7 @@ F3: equal to "=" | |||
75 | ---------------------------------------------------------------------------*/ | 75 | ---------------------------------------------------------------------------*/ |
76 | 76 | ||
77 | #include "plugin.h" | 77 | #include "plugin.h" |
78 | #ifdef HAVE_LCD_BITMAP | 78 | |
79 | #include "math.h" | 79 | #include "math.h" |
80 | 80 | ||
81 | 81 | ||
@@ -1767,5 +1767,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1767 | rb->button_clear_queue(); | 1767 | rb->button_clear_queue(); |
1768 | return PLUGIN_OK; | 1768 | return PLUGIN_OK; |
1769 | } | 1769 | } |
1770 | |||
1771 | #endif /* #ifdef HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 6a8f1eb0c1..6b923a6ed0 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | #include "lib/pluginlib_exit.h" | 25 | #include "lib/pluginlib_exit.h" |
26 | 26 | ||
27 | #ifdef HAVE_LCD_BITMAP | ||
28 | #include "lib/pluginlib_actions.h" | 27 | #include "lib/pluginlib_actions.h" |
29 | #include "lib/helper.h" | 28 | #include "lib/helper.h" |
30 | 29 | ||
@@ -445,5 +444,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
445 | 444 | ||
446 | return ret; | 445 | return ret; |
447 | } | 446 | } |
448 | |||
449 | #endif /* #ifdef HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c index 08dc377368..d7aa61f806 100644 --- a/apps/plugins/euroconverter.c +++ b/apps/plugins/euroconverter.c | |||
@@ -22,8 +22,6 @@ | |||
22 | #include "lib/configfile.h" | 22 | #include "lib/configfile.h" |
23 | #include "lib/pluginlib_exit.h" | 23 | #include "lib/pluginlib_exit.h" |
24 | 24 | ||
25 | #ifdef HAVE_LCD_CHARCELLS | ||
26 | |||
27 | /* Euro converter for the player */ | 25 | /* Euro converter for the player */ |
28 | /* | 26 | /* |
29 | Use: | 27 | Use: |
@@ -599,5 +597,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
599 | } | 597 | } |
600 | return PLUGIN_OK; | 598 | return PLUGIN_OK; |
601 | } | 599 | } |
602 | |||
603 | #endif | ||
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 268a934692..b03f68b670 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -23,7 +23,6 @@ | |||
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | #include "lib/helper.h" | 25 | #include "lib/helper.h" |
26 | #ifdef HAVE_LCD_BITMAP | ||
27 | 26 | ||
28 | #include "lib/pluginlib_actions.h" | 27 | #include "lib/pluginlib_actions.h" |
29 | #include "lib/fixedpoint.h" | 28 | #include "lib/fixedpoint.h" |
@@ -382,5 +381,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
382 | 381 | ||
383 | return ret; | 382 | return ret; |
384 | } | 383 | } |
385 | |||
386 | #endif /* #ifdef HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c index a1ce22c83f..b744eac70f 100644 --- a/apps/plugins/iriver_flash.c +++ b/apps/plugins/iriver_flash.c | |||
@@ -27,16 +27,10 @@ | |||
27 | unsigned char *audiobuf; | 27 | unsigned char *audiobuf; |
28 | ssize_t audiobuf_size; | 28 | ssize_t audiobuf_size; |
29 | 29 | ||
30 | #ifdef IRIVER_H100_SERIES | 30 | #ifndef IRIVER_H100_SERIES |
31 | #define PLATFORM_ID ID_IRIVER_H100 | 31 | #error this platform is not (yet) flashable |
32 | #else | ||
33 | #undef PLATFORM_ID /* this platform is not (yet) flashable */ | ||
34 | #endif | 32 | #endif |
35 | 33 | ||
36 | #ifdef PLATFORM_ID | ||
37 | |||
38 | |||
39 | |||
40 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 34 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |
41 | #define KEY1 BUTTON_OFF | 35 | #define KEY1 BUTTON_OFF |
42 | #define KEY2 BUTTON_ON | 36 | #define KEY2 BUTTON_ON |
@@ -770,5 +764,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
770 | 764 | ||
771 | return PLUGIN_OK; | 765 | return PLUGIN_OK; |
772 | } | 766 | } |
773 | |||
774 | #endif /* ifdef PLATFORM_ID */ | ||
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index fdf4ff70e5..c636619b43 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -27,10 +27,6 @@ | |||
27 | #include "lib/playback_control.h" | 27 | #include "lib/playback_control.h" |
28 | #include "pluginbitmaps/jewels.h" | 28 | #include "pluginbitmaps/jewels.h" |
29 | 29 | ||
30 | #ifdef HAVE_LCD_BITMAP | ||
31 | |||
32 | |||
33 | |||
34 | /* button definitions */ | 30 | /* button definitions */ |
35 | #if CONFIG_KEYPAD == RECORDER_PAD | 31 | #if CONFIG_KEYPAD == RECORDER_PAD |
36 | #define JEWELS_UP BUTTON_UP | 32 | #define JEWELS_UP BUTTON_UP |
@@ -1601,5 +1597,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1601 | 1597 | ||
1602 | return PLUGIN_OK; | 1598 | return PLUGIN_OK; |
1603 | } | 1599 | } |
1604 | |||
1605 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 5793ddedf8..3925c2c7bc 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -21,8 +21,6 @@ | |||
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #ifdef HAVE_LCD_BITMAP | ||
25 | |||
26 | #include "lib/playback_control.h" | 24 | #include "lib/playback_control.h" |
27 | 25 | ||
28 | 26 | ||
@@ -926,5 +924,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
926 | 924 | ||
927 | return PLUGIN_OK; | 925 | return PLUGIN_OK; |
928 | } | 926 | } |
929 | |||
930 | #endif | ||
diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c index 07e41ffe3e..3a3a870dad 100644 --- a/apps/plugins/nim.c +++ b/apps/plugins/nim.c | |||
@@ -21,8 +21,6 @@ | |||
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "lib/pluginlib_exit.h" | 22 | #include "lib/pluginlib_exit.h" |
23 | 23 | ||
24 | #ifdef HAVE_LCD_CHARCELLS | ||
25 | |||
26 | /* NIM game for the player | 24 | /* NIM game for the player |
27 | 25 | ||
28 | Rules of nim game | 26 | Rules of nim game |
@@ -290,4 +288,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
290 | } | 288 | } |
291 | return PLUGIN_OK; | 289 | return PLUGIN_OK; |
292 | } | 290 | } |
293 | #endif | ||
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index e9c21ff119..10966c9ebc 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "lib/helper.h" | 25 | #include "lib/helper.h" |
26 | #include "lib/pluginlib_exit.h" | 26 | #include "lib/pluginlib_exit.h" |
27 | 27 | ||
28 | #ifdef HAVE_LCD_BITMAP | ||
29 | #include "lib/xlcd.h" | 28 | #include "lib/xlcd.h" |
30 | #include "lib/configfile.h" | 29 | #include "lib/configfile.h" |
31 | 30 | ||
@@ -916,4 +915,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
916 | } | 915 | } |
917 | return PLUGIN_OK; | 916 | return PLUGIN_OK; |
918 | } | 917 | } |
919 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 35bc03ba1f..58d903cb06 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -29,8 +29,6 @@ | |||
29 | #include "lib/pluginlib_actions.h" | 29 | #include "lib/pluginlib_actions.h" |
30 | #include "lib/pluginlib_exit.h" | 30 | #include "lib/pluginlib_exit.h" |
31 | 31 | ||
32 | #ifdef HAVE_LCD_BITMAP | ||
33 | |||
34 | #ifndef HAVE_LCD_COLOR | 32 | #ifndef HAVE_LCD_COLOR |
35 | #include "lib/grey.h" | 33 | #include "lib/grey.h" |
36 | #endif | 34 | #endif |
@@ -326,5 +324,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
326 | #endif | 324 | #endif |
327 | return main(); | 325 | return main(); |
328 | } | 326 | } |
329 | |||
330 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 8a41d9eeb2..83a8e48228 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -20,10 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | 22 | ||
23 | #ifdef HAVE_LCD_BITMAP | ||
24 | |||
25 | |||
26 | |||
27 | #define PAD_HEIGHT LCD_HEIGHT / 6 /* Recorder: 10 iRiver: 21 */ | 23 | #define PAD_HEIGHT LCD_HEIGHT / 6 /* Recorder: 10 iRiver: 21 */ |
28 | #define PAD_WIDTH LCD_WIDTH / 50 /* Recorder: 2 iRiver: 2 */ | 24 | #define PAD_WIDTH LCD_WIDTH / 50 /* Recorder: 2 iRiver: 2 */ |
29 | 25 | ||
@@ -587,5 +583,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
587 | 583 | ||
588 | return (game == 0) ? PLUGIN_OK : PLUGIN_USB_CONNECTED; | 584 | return (game == 0) ? PLUGIN_OK : PLUGIN_USB_CONNECTED; |
589 | } | 585 | } |
590 | |||
591 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/ppmviewer.c b/apps/plugins/ppmviewer.c index 035fffe92a..e138692aef 100644 --- a/apps/plugins/ppmviewer.c +++ b/apps/plugins/ppmviewer.c | |||
@@ -22,10 +22,6 @@ | |||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "lib/pluginlib_bmp.h" | 23 | #include "lib/pluginlib_bmp.h" |
24 | 24 | ||
25 | #if defined(HAVE_LCD_COLOR) | ||
26 | |||
27 | |||
28 | |||
29 | /* Magic constants. */ | 25 | /* Magic constants. */ |
30 | #define PPM_MAGIC1 'P' | 26 | #define PPM_MAGIC1 'P' |
31 | #define PPM_MAGIC2 '3' | 27 | #define PPM_MAGIC2 '3' |
@@ -357,5 +353,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
357 | 353 | ||
358 | return PLUGIN_OK; | 354 | return PLUGIN_OK; |
359 | } | 355 | } |
360 | |||
361 | #endif | ||
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 1306cc9932..6a175e5bb5 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -22,11 +22,6 @@ | |||
22 | 22 | ||
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | |||
26 | |||
27 | |||
28 | #ifdef HAVE_LCD_BITMAP | ||
29 | |||
30 | #if CONFIG_KEYPAD == RECORDER_PAD | 25 | #if CONFIG_KEYPAD == RECORDER_PAD |
31 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | 26 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY |
32 | #define ONEDROCKBLOX_QUIT BUTTON_OFF | 27 | #define ONEDROCKBLOX_QUIT BUTTON_OFF |
@@ -323,4 +318,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
323 | 318 | ||
324 | return PLUGIN_OK; | 319 | return PLUGIN_OK; |
325 | } | 320 | } |
326 | #endif | ||
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index f1c4f537da..9da3f63c8b 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c | |||
@@ -23,10 +23,6 @@ | |||
23 | ****************************************************************************/ | 23 | ****************************************************************************/ |
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | #if (CONFIG_CPU == SH7034) /* Only for SH targets */ | ||
27 | |||
28 | |||
29 | |||
30 | /* define DUMMY if you only want to "play" with the UI, does no harm */ | 26 | /* define DUMMY if you only want to "play" with the UI, does no harm */ |
31 | /* #define DUMMY */ | 27 | /* #define DUMMY */ |
32 | 28 | ||
@@ -957,6 +953,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
957 | 953 | ||
958 | return PLUGIN_OK; | 954 | return PLUGIN_OK; |
959 | } | 955 | } |
960 | |||
961 | |||
962 | #endif /* SH-target */ | ||
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 4d7d2c00ca..6ea04d5057 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -20,9 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | 22 | ||
23 | #ifdef HAVE_LCD_BITMAP | ||
24 | |||
25 | |||
26 | /* variable button definitions */ | 23 | /* variable button definitions */ |
27 | #if CONFIG_KEYPAD == RECORDER_PAD | 24 | #if CONFIG_KEYPAD == RECORDER_PAD |
28 | #define PUZZLE_QUIT BUTTON_OFF | 25 | #define PUZZLE_QUIT BUTTON_OFF |
@@ -818,5 +815,3 @@ enum plugin_status plugin_start( | |||
818 | 815 | ||
819 | return puzzle_loop(); | 816 | return puzzle_loop(); |
820 | } | 817 | } |
821 | |||
822 | #endif | ||
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 00a43e5cc7..5ae941a655 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -33,7 +33,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "plugin.h" | 35 | #include "plugin.h" |
36 | #ifdef HAVE_LCD_BITMAP | 36 | |
37 | #include "lib/configfile.h" | 37 | #include "lib/configfile.h" |
38 | #include "lib/highscore.h" | 38 | #include "lib/highscore.h" |
39 | #include "lib/playback_control.h" | 39 | #include "lib/playback_control.h" |
@@ -529,4 +529,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
529 | highscore_save(SCORE_FILE, highscores, NUM_SCORES); | 529 | highscore_save(SCORE_FILE, highscores, NUM_SCORES); |
530 | return PLUGIN_OK; | 530 | return PLUGIN_OK; |
531 | } | 531 | } |
532 | #endif | ||
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 3fbf40b8f9..eb101cf1bd 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -30,7 +30,7 @@ Head and Tail are stored | |||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "plugin.h" | 32 | #include "plugin.h" |
33 | #ifdef HAVE_LCD_BITMAP | 33 | |
34 | #include "lib/highscore.h" | 34 | #include "lib/highscore.h" |
35 | #include "lib/playback_control.h" | 35 | #include "lib/playback_control.h" |
36 | 36 | ||
@@ -1525,5 +1525,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1525 | 1525 | ||
1526 | return (quit==1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED; | 1526 | return (quit==1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED; |
1527 | } | 1527 | } |
1528 | |||
1529 | #endif | ||
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 1d2535f657..dc2bd79420 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -26,10 +26,6 @@ | |||
26 | #include "button.h" | 26 | #include "button.h" |
27 | #include "lcd.h" | 27 | #include "lcd.h" |
28 | 28 | ||
29 | #ifdef HAVE_LCD_BITMAP | ||
30 | |||
31 | |||
32 | |||
33 | #define min(a,b) (a<b?a:b) | 29 | #define min(a,b) (a<b?a:b) |
34 | 30 | ||
35 | /** | 31 | /** |
@@ -1928,5 +1924,3 @@ enum plugin_status plugin_start(const void* parameter ) | |||
1928 | /* Exit the plugin */ | 1924 | /* Exit the plugin */ |
1929 | return ( result == SOLITAIRE_USB ) ? PLUGIN_USB_CONNECTED : PLUGIN_OK; | 1925 | return ( result == SOLITAIRE_USB ) ? PLUGIN_USB_CONNECTED : PLUGIN_OK; |
1930 | } | 1926 | } |
1931 | |||
1932 | #endif | ||
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index c0f099775f..e5d8259d88 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #ifdef HAVE_LCD_BITMAP | 22 | |
23 | #include "lib/display_text.h" | 23 | #include "lib/display_text.h" |
24 | #include "lib/playback_control.h" | 24 | #include "lib/playback_control.h" |
25 | 25 | ||
@@ -1162,5 +1162,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
1162 | /* display choice menu */ | 1162 | /* display choice menu */ |
1163 | return star_menu(); | 1163 | return star_menu(); |
1164 | } | 1164 | } |
1165 | |||
1166 | #endif | ||
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 09f58da1f6..7f17970a84 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -21,10 +21,6 @@ | |||
21 | #include "lib/helper.h" | 21 | #include "lib/helper.h" |
22 | #include "lib/pluginlib_exit.h" | 22 | #include "lib/pluginlib_exit.h" |
23 | 23 | ||
24 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ | ||
25 | |||
26 | |||
27 | |||
28 | /******************************* Globals ***********************************/ | 24 | /******************************* Globals ***********************************/ |
29 | 25 | ||
30 | /* Key assignement */ | 26 | /* Key assignement */ |
@@ -524,5 +520,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
524 | 520 | ||
525 | return ret; | 521 | return ret; |
526 | } | 522 | } |
527 | |||
528 | #endif /* #ifdef HAVE_LCD_BITMAP */ | ||
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index 80a8d88104..f57f45b000 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c | |||
@@ -22,8 +22,6 @@ | |||
22 | #include "lib/helper.h" | 22 | #include "lib/helper.h" |
23 | #include "lib/grey.h" | 23 | #include "lib/grey.h" |
24 | 24 | ||
25 | #ifdef HAVE_LCD_BITMAP | ||
26 | |||
27 | PLUGIN_IRAM_DECLARE | 25 | PLUGIN_IRAM_DECLARE |
28 | 26 | ||
29 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
@@ -385,4 +383,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
385 | 383 | ||
386 | return PLUGIN_OK; | 384 | return PLUGIN_OK; |
387 | } | 385 | } |
388 | #endif | ||
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 81d8248013..d29544fb33 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -21,10 +21,6 @@ | |||
21 | 21 | ||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) && !defined(SIMULATOR) | ||
25 | |||
26 | |||
27 | |||
28 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ | 24 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \ |
29 | || (CONFIG_KEYPAD == IRIVER_H100_PAD) | 25 | || (CONFIG_KEYPAD == IRIVER_H100_PAD) |
30 | #define SCANRATE_DONE BUTTON_OFF | 26 | #define SCANRATE_DONE BUTTON_OFF |
@@ -245,5 +241,3 @@ enum plugin_status plugin_start(const void* parameter) | |||
245 | (void)parameter; | 241 | (void)parameter; |
246 | return plugin_main(); | 242 | return plugin_main(); |
247 | } | 243 | } |
248 | |||
249 | #endif | ||