len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove build conditions inside .c plugin files

Browse source 
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
This commit is contained in:
Rafaël Carré 2010-08-25 19:00:58 +00:00
parent b11767b7ae
commit 7014faee69
25 changed files with 15 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/plugins/SOURCES
View file

@ -150,10 +150,6 @@ robotfindskitten.c
xobox.c
spacerocks.c
/* Plugins needing the grayscale lib on low-depth LCDs */
fire.c
plasma.c
blackjack.c
bounce.c
bubbles.c
@ -176,6 +172,10 @@ starfield.c
vu_meter.c
wormlet.c
/* Plugins needing the grayscale lib on low-depth LCDs */
fire.c
plasma.c
#ifdef HAVE_LCD_COLOR
clix.c
ppmviewer.c
@ -225,9 +225,12 @@ test_codec.c
test_core_jpeg.c
#endif
test_disk.c
test_fps.c
#ifdef HAVE_LCD_BITMAP
test_fps.c
test_gfx.c
#if LCD_DEPTH < 4 && !defined(SIMULATOR)
test_scanrate.c
#endif
#ifndef HAVE_LCD_COLOR
test_grey.c
test_greylib_bitmap_scale.c
@ -243,9 +246,8 @@ test_resize.c
#if CONFIG_CODEC == SWCODEC
test_sampr.c
#endif
test_scanrate.c
#ifdef HAVE_TOUCHSCREEN
test_touchscreen.c
#endif
test_viewports.c
#endif
#endif /* HAVE_TEST_PLUGINS */

7
apps/plugins/alpine_cdc.c
View file

@ -33,11 +33,6 @@
#include "plugin.h"
/* Only build for (correct) target */
#if CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC)
#ifdef HAVE_LCD_CHARCELLS /* player model */
#define LINES 2
#define COLUMNS 11
@ -1198,5 +1193,3 @@ enum plugin_status plugin_start(const void* parameter)
/* now go ahead and have fun! */
return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR;
}
#endif /* CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC) */

4
apps/plugins/bubbles.c
View file

@ -23,8 +23,6 @@
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/xlcd.h"
#include "lib/pluginlib_actions.h"
#include "lib/fixedpoint.h"
@ -2566,5 +2564,3 @@ enum plugin_status plugin_start(const void* parameter) {
rb->lcd_setfont(FONT_UI);
return ret;
}
#endif

4
apps/plugins/calculator.c
View file

@ -75,7 +75,7 @@ F3: equal to "="
---------------------------------------------------------------------------*/
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#include "math.h"
@ -1767,5 +1767,3 @@ enum plugin_status plugin_start(const void* parameter)
rb->button_clear_queue();
return PLUGIN_OK;
}
#endif /* #ifdef HAVE_LCD_BITMAP */

3
apps/plugins/demystify.c
View file

@ -24,7 +24,6 @@
#include "plugin.h"
#include "lib/pluginlib_exit.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/pluginlib_actions.h"
#include "lib/helper.h"
@ -445,5 +444,3 @@ enum plugin_status plugin_start(const void* parameter)
return ret;
}
#endif /* #ifdef HAVE_LCD_BITMAP */

4
apps/plugins/euroconverter.c
View file

@ -22,8 +22,6 @@
#include "lib/configfile.h"
#include "lib/pluginlib_exit.h"
#ifdef HAVE_LCD_CHARCELLS
/* Euro converter for the player */
/*
Use:
@ -599,5 +597,3 @@ enum plugin_status plugin_start(const void* parameter)
}
return PLUGIN_OK;
}
#endif

3
apps/plugins/fire.c
View file

@ -23,7 +23,6 @@
#include "plugin.h"
#include "lib/helper.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/pluginlib_actions.h"
#include "lib/fixedpoint.h"
@ -382,5 +381,3 @@ enum plugin_status plugin_start(const void* parameter)
return ret;
}
#endif /* #ifdef HAVE_LCD_BITMAP */

12
apps/plugins/iriver_flash.c
View file

@ -27,16 +27,10 @@
unsigned char *audiobuf;
ssize_t audiobuf_size;
#ifdef IRIVER_H100_SERIES
#define PLATFORM_ID ID_IRIVER_H100
#else
#undef PLATFORM_ID /* this platform is not (yet) flashable */
#ifndef IRIVER_H100_SERIES
#error this platform is not (yet) flashable
#endif
#ifdef PLATFORM_ID
#if CONFIG_KEYPAD == IRIVER_H100_PAD
#define KEY1 BUTTON_OFF
#define KEY2 BUTTON_ON
@ -770,5 +764,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif /* ifdef PLATFORM_ID */

6
apps/plugins/jewels.c
View file

@ -27,10 +27,6 @@
#include "lib/playback_control.h"
#include "pluginbitmaps/jewels.h"
#ifdef HAVE_LCD_BITMAP
/* button definitions */
#if CONFIG_KEYPAD == RECORDER_PAD
#define JEWELS_UP BUTTON_UP
@ -1601,5 +1597,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif /* HAVE_LCD_BITMAP */

4
apps/plugins/minesweeper.c
View file

@ -21,8 +21,6 @@
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/playback_control.h"
@ -926,5 +924,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif

3
apps/plugins/nim.c
View file

@ -21,8 +21,6 @@
#include "plugin.h"
#include "lib/pluginlib_exit.h"
#ifdef HAVE_LCD_CHARCELLS
/* NIM game for the player
Rules of nim game
@ -290,4 +288,3 @@ enum plugin_status plugin_start(const void* parameter)
}
return PLUGIN_OK;
}
#endif

2
apps/plugins/oscilloscope.c
View file

@ -25,7 +25,6 @@
#include "lib/helper.h"
#include "lib/pluginlib_exit.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/xlcd.h"
#include "lib/configfile.h"
@ -916,4 +915,3 @@ enum plugin_status plugin_start(const void* parameter)
}
return PLUGIN_OK;
}
#endif /* HAVE_LCD_BITMAP */

4
apps/plugins/plasma.c
View file

@ -29,8 +29,6 @@
#include "lib/pluginlib_actions.h"
#include "lib/pluginlib_exit.h"
#ifdef HAVE_LCD_BITMAP
#ifndef HAVE_LCD_COLOR
#include "lib/grey.h"
#endif
@ -326,5 +324,3 @@ enum plugin_status plugin_start(const void* parameter)
#endif
return main();
}
#endif /* HAVE_LCD_BITMAP */

6
apps/plugins/pong.c
View file

@ -20,10 +20,6 @@
****************************************************************************/
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#define PAD_HEIGHT LCD_HEIGHT / 6 /* Recorder: 10 iRiver: 21 */
#define PAD_WIDTH LCD_WIDTH / 50 /* Recorder: 2 iRiver: 2 */
@ -587,5 +583,3 @@ enum plugin_status plugin_start(const void* parameter)
return (game == 0) ? PLUGIN_OK : PLUGIN_USB_CONNECTED;
}
#endif /* HAVE_LCD_BITMAP */

6
apps/plugins/ppmviewer.c
View file

@ -22,10 +22,6 @@
#include "plugin.h"
#include "lib/pluginlib_bmp.h"
#if defined(HAVE_LCD_COLOR)
/* Magic constants. */
#define PPM_MAGIC1 'P'
#define PPM_MAGIC2 '3'
@ -357,5 +353,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif

6
apps/plugins/rockblox1d.c
View file

@ -22,11 +22,6 @@
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#if CONFIG_KEYPAD == RECORDER_PAD
#define ONEDROCKBLOX_DOWN BUTTON_PLAY
#define ONEDROCKBLOX_QUIT BUTTON_OFF
@ -323,4 +318,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif

7
apps/plugins/rockbox_flash.c
View file

@ -23,10 +23,6 @@
****************************************************************************/
#include "plugin.h"
#if (CONFIG_CPU == SH7034) /* Only for SH targets */
/* define DUMMY if you only want to "play" with the UI, does no harm */
/* #define DUMMY */
@ -957,6 +953,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif /* SH-target */

5
apps/plugins/sliding_puzzle.c
View file

@ -20,9 +20,6 @@
****************************************************************************/
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
/* variable button definitions */
#if CONFIG_KEYPAD == RECORDER_PAD
#define PUZZLE_QUIT BUTTON_OFF
@ -818,5 +815,3 @@ enum plugin_status plugin_start(
return puzzle_loop();
}
#endif

3
apps/plugins/snake.c
View file

@ -33,7 +33,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left;
*/
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/configfile.h"
#include "lib/highscore.h"
#include "lib/playback_control.h"
@ -529,4 +529,3 @@ enum plugin_status plugin_start(const void* parameter)
highscore_save(SCORE_FILE, highscores, NUM_SCORES);
return PLUGIN_OK;
}
#endif

4
apps/plugins/snake2.c
View file

@ -30,7 +30,7 @@ Head and Tail are stored
*/
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/highscore.h"
#include "lib/playback_control.h"
@ -1525,5 +1525,3 @@ enum plugin_status plugin_start(const void* parameter)
return (quit==1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED;
}
#endif

6
apps/plugins/solitaire.c
View file

@ -26,10 +26,6 @@
#include "button.h"
#include "lcd.h"
#ifdef HAVE_LCD_BITMAP
#define min(a,b) (a<b?a:b)
/**
@ -1928,5 +1924,3 @@ enum plugin_status plugin_start(const void* parameter )
/* Exit the plugin */
return ( result == SOLITAIRE_USB ) ? PLUGIN_USB_CONNECTED : PLUGIN_OK;
}
#endif

4
apps/plugins/star.c
View file

@ -19,7 +19,7 @@
*
****************************************************************************/
#include "plugin.h"
#ifdef HAVE_LCD_BITMAP
#include "lib/display_text.h"
#include "lib/playback_control.h"
@ -1162,5 +1162,3 @@ enum plugin_status plugin_start(const void* parameter)
/* display choice menu */
return star_menu();
}
#endif

6
apps/plugins/starfield.c
View file

@ -21,10 +21,6 @@
#include "lib/helper.h"
#include "lib/pluginlib_exit.h"
#ifdef HAVE_LCD_BITMAP /* and also not for the Player */
/******************************* Globals ***********************************/
/* Key assignement */
@ -524,5 +520,3 @@ enum plugin_status plugin_start(const void* parameter)
return ret;
}
#endif /* #ifdef HAVE_LCD_BITMAP */

3
apps/plugins/test_fps.c
View file

@ -22,8 +22,6 @@
#include "lib/helper.h"
#include "lib/grey.h"
#ifdef HAVE_LCD_BITMAP
PLUGIN_IRAM_DECLARE
#if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \
@ -385,4 +383,3 @@ enum plugin_status plugin_start(const void* parameter)
return PLUGIN_OK;
}
#endif

6
apps/plugins/test_scanrate.c
View file

@ -21,10 +21,6 @@
#include "plugin.h"
#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) && !defined(SIMULATOR)
#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) \
|| (CONFIG_KEYPAD == IRIVER_H100_PAD)
#define SCANRATE_DONE BUTTON_OFF
@ -245,5 +241,3 @@ enum plugin_status plugin_start(const void* parameter)
(void)parameter;
return plugin_main();
}
#endif