summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZakk Roberts <midk@rockbox.org>2006-03-13 03:31:02 +0000
committerZakk Roberts <midk@rockbox.org>2006-03-13 03:31:02 +0000
commit0b8766f9d2d6e7081d332fe7837bb3abae0fa9b9 (patch)
tree09d168cc5476edd4a18cfc90d5c45f9868ca1da1
parentc091a77381ab9fba79919da84a507bccab902b2f (diff)
downloadrockbox-0b8766f9d2d6e7081d332fe7837bb3abae0fa9b9.zip
rockbox-0b8766f9d2d6e7081d332fe7837bb3abae0fa9b9.tar.gz
rockbox-0b8766f9d2d6e7081d332fe7837bb3abae0fa9b9.tar.bz2
rockbox-0b8766f9d2d6e7081d332fe7837bb3abae0fa9b9.tar.xz
(Hopefully) fixed the ugliest build table we've had in quite a while..
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9021 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/SOURCES4
-rw-r--r--apps/plugins/wormlet.c12
2 files changed, 10 insertions, 6 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index a4a1a34..3487635 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -32,7 +32,11 @@ plasma.c
bejeweled.c
bounce.c
+
+#if !(CONFIG_KEYPAD == IAUDIO_X5_PAD) ||
+ !(CONFIG_KEYPAD == IPOD_3G_PAD)
wormlet.c
+#endif
#if (LCD_WIDTH != 138) && (LCD_WIDTH != 128)
/* These need adjusting for the Mini's and iRiver if'p screen */
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 8c24976..23e0651 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -70,9 +70,9 @@ PLUGIN_HEADER
#define BTN_DIR_DOWN BUTTON_DOWN
#define BTN_DIR_LEFT BUTTON_LEFT
#define BTN_DIR_RIGHT BUTTON_RIGHT
-#define BTN_STARTPAUSE (BUTTON_MODE|BUTTON_REL)
-#define BTN_QUIT (BUTTON_ONOFF|BUTTON_REL)
-#define BTN_STOPRESET (BUTTON_ONOFF|BUTTON_MODE)
+#define BTN_STARTPAUSE (BUTTON_MENU|BUTTON_REL)
+#define BTN_QUIT (BUTTON_OFF|BUTTON_REL)
+#define BTN_STOPRESET (BUTTON_OFF|BUTTON_MENU)
#define PLAYERS_TEXT "UP/DN"
#define WORMS_TEXT "L/R"
@@ -90,8 +90,7 @@ PLUGIN_HEADER
#define PLAYERS_TEXT "Menu/Play"
#define WORMS_TEXT "Left/Right"
-#elif (CONFIG_KEYPAD == IRIVER_H300_PAD) ||
- (CONFIG_KEYPAD == IRIVER_H100_PAD)
+#elif (CONFIG_KEYPAD == IRIVER_H300_PAD) || (CONFIG_KEYPAD == IRIVER_H100_PAD)
#define BTN_DIR_UP BUTTON_UP
#define BTN_DIR_DOWN BUTTON_DOWN
@@ -2014,8 +2013,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
/* Setup screen */
do {
- char buf[40];
+#if defined MULTIPLAYER && defined REMOTE
char* ptr;
+#endif
rb->lcd_clear_display();
/* first line players */