From 8f28c0443cb0c4834e80082a5f77927bab2de937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Wed, 23 Jun 2010 18:27:30 +0000 Subject: [PATCH] Build doom on clipv2 and clip+ git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27093 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/SUBDIRS | 6 +++--- apps/plugins/doom/i_video.c | 10 +++++++++ manual/plugins/doom.tex | 19 +++++++++--------- .../images/ss-doom-128x64x1-sansaclip.png | Bin 0 -> 6006 bytes 4 files changed, 23 insertions(+), 12 deletions(-) create mode 100755 manual/plugins/images/ss-doom-128x64x1-sansaclip.png diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 4074177ce2..414ae46123 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS @@ -57,9 +57,9 @@ zxbox pacbox #endif -#if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ - (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) && \ - !defined(RB_PROFILE) +#if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || defined(SANSA_CLIPPLUS) \ + || defined(SANSA_CLIPV2) || (LCD_DEPTH == 2)) \ + && (MEMORYSIZE > 2 && !defined(RB_PROFILE)) doom #endif diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index dc0374f852..e7f8e9014b 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -222,6 +222,16 @@ void I_ShutdownGraphics(void) #define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ENTER BUTTON_SELECT #define DOOMBUTTON_WEAPON BUTTON_VOL_UP +#elif CONFIG_KEYPAD == SANSA_CLIP_PAD +#define DOOMBUTTON_UP BUTTON_UP +#define DOOMBUTTON_DOWN BUTTON_DOWN +#define DOOMBUTTON_LEFT BUTTON_LEFT +#define DOOMBUTTON_RIGHT BUTTON_RIGHT +#define DOOMBUTTON_SHOOT BUTTON_SELECT +#define DOOMBUTTON_OPEN BUTTON_HOME +#define DOOMBUTTON_ESC BUTTON_POWER +#define DOOMBUTTON_ENTER BUTTON_SELECT +#define DOOMBUTTON_WEAPON BUTTON_VOL_UP #elif CONFIG_KEYPAD == GIGABEAT_PAD #define DOOMBUTTON_UP BUTTON_UP #define DOOMBUTTON_DOWN BUTTON_DOWN diff --git a/manual/plugins/doom.tex b/manual/plugins/doom.tex index 0535a8d76a..81df31a356 100644 --- a/manual/plugins/doom.tex +++ b/manual/plugins/doom.tex @@ -54,7 +54,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}% \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}% - \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD, SANSA_C200_PAD% + \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}% \opt{SANSA_FUZE_PAD}{pressing \ButtonHome} \opt{PBELL_VIBE500_PAD}{pressing \ButtonRec} @@ -78,7 +78,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin \subsubsection{Keys} \begin{btnmap} - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp} \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu} \opt{IRIVER_H10_PAD}{\ButtonScrollUp} @@ -88,7 +88,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin & Move Forward \\ % \nopt{IPOD_3G_PAD,IPOD_4G_PAD,COWON_D2_PAD}{ - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown} \opt{IRIVER_H10_PAD}{\ButtonScrollDown} \opt{COWON_D2_PAD}{\TouchBottomMiddle} @@ -97,14 +97,14 @@ Rockdoom options, you will need to quit your current game and restart the plugin & Down\\ } % - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD% ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD% ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonLeft} \opt{COWON_D2_PAD}{\TouchMidLeft} \opt{HAVEREMOTEKEYMAP}{& } & Turn Left \\ % - \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD% + \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD% ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD% ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight} \opt{COWON_D2_PAD}{\TouchMidRight} @@ -113,7 +113,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin % \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD}{\ButtonPlay} - \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonSelect} + \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{GIGABEAT_PAD}{\ButtonA} \opt{MROBE100_PAD}{\ButtonDisplay} @@ -127,6 +127,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} \opt{SANSA_FUZE_PAD}{\ButtonPower} + \opt{SANSA_CLIP_PAD}{\ButtonHome} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu} \opt{PBELL_VIBE500_PAD}{\ButtonOK} \opt{HAVEREMOTEKEYMAP}{& } @@ -135,7 +136,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch} \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD% - ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower} + ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower} \opt{SANSA_FUZE_PAD}{\ButtonHome} \opt{COWON_D2_PAD}{\TouchTopLeft} \opt{PBELL_VIBE500_PAD}{\ButtonRec} @@ -144,7 +145,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin % \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD% ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% - ,MROBE100_PAD}{\ButtonSelect} + ,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonSelect} \opt{IRIVER_H10_PAD}{\ButtonRew} \opt{COWON_D2_PAD}{\TouchCenter} \opt{PBELL_VIBE500_PAD}{\ButtonPower} @@ -156,7 +157,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin \opt{IAUDIO_X5_PAD}{\ButtonRec} \opt{IRIVER_H10_PAD}{\ButtonFF} \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} - \opt{SANSA_C200_PAD}{\ButtonVolUp} + \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown} \opt{COWON_D2_PAD}{\TouchBottomLeft} \opt{PBELL_VIBE500_PAD}{\ButtonPlay} diff --git a/manual/plugins/images/ss-doom-128x64x1-sansaclip.png b/manual/plugins/images/ss-doom-128x64x1-sansaclip.png new file mode 100755 index 0000000000000000000000000000000000000000..9240d86591b80a3f4938aa7d92c8c895c10a2e3f GIT binary patch literal 6006 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 G_5T37kJusr literal 0 HcmV?d00001