From 2f2c99290bb4ee82118f73ff9f20abe70449c7ff Mon Sep 17 00:00:00 2001 From: funman 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 ++++++++++--------- manual/plugins/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 4074177ce..414ae4612 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 dc0374f85..e7f8e9014 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 0535a8d76..81df31a35 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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 DyN}o+ literal 0 HcwPel00001 -- 2.11.4.GIT