diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-23 18:27:30 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-23 18:27:30 +0000 |
commit | 8f28c0443cb0c4834e80082a5f77927bab2de937 (patch) | |
tree | dc3b42bc370f57961baed80714e446a4cb8ffcee | |
parent | e39f4098f21ddb5105867cb6183c8df8102c9231 (diff) | |
download | rockbox-8f28c0443cb0c4834e80082a5f77927bab2de937.tar.gz rockbox-8f28c0443cb0c4834e80082a5f77927bab2de937.zip |
Build doom on clipv2 and clip+
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27093 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SUBDIRS | 6 | ||||
-rw-r--r-- | apps/plugins/doom/i_video.c | 10 | ||||
-rw-r--r-- | manual/plugins/doom.tex | 19 | ||||
-rwxr-xr-x | manual/plugins/images/ss-doom-128x64x1-sansaclip.png | bin | 0 -> 6006 bytes |
4 files changed, 23 insertions, 12 deletions
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 | |||
57 | pacbox | 57 | pacbox |
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | #if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ | 60 | #if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || defined(SANSA_CLIPPLUS) \ |
61 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) && \ | 61 | || defined(SANSA_CLIPV2) || (LCD_DEPTH == 2)) \ |
62 | !defined(RB_PROFILE) | 62 | && (MEMORYSIZE > 2 && !defined(RB_PROFILE)) |
63 | doom | 63 | doom |
64 | #endif | 64 | #endif |
65 | 65 | ||
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) | |||
222 | #define DOOMBUTTON_ESC BUTTON_POWER | 222 | #define DOOMBUTTON_ESC BUTTON_POWER |
223 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 223 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
224 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 224 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
225 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD | ||
226 | #define DOOMBUTTON_UP BUTTON_UP | ||
227 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
228 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
229 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
230 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
231 | #define DOOMBUTTON_OPEN BUTTON_HOME | ||
232 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
233 | #define DOOMBUTTON_ENTER BUTTON_SELECT | ||
234 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | ||
225 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 235 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
226 | #define DOOMBUTTON_UP BUTTON_UP | 236 | #define DOOMBUTTON_UP BUTTON_UP |
227 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 237 | #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 | |||
54 | \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by | 54 | \item[InGame Main Menu. ]This menu can only be accessed from within a running game, and is displayed by |
55 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}% | 55 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{pressing \ButtonOff}% |
56 | \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}% | 56 | \opt{IPOD_3G_PAD,IPOD_4G_PAD}{flipping your \ButtonHold{} switch a couple of times}% |
57 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD, SANSA_C200_PAD% | 57 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% |
58 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}% | 58 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,COWON_D2_PAD}{pressing \ButtonPower}% |
59 | \opt{SANSA_FUZE_PAD}{pressing \ButtonHome} | 59 | \opt{SANSA_FUZE_PAD}{pressing \ButtonHome} |
60 | \opt{PBELL_VIBE500_PAD}{pressing \ButtonRec} | 60 | \opt{PBELL_VIBE500_PAD}{pressing \ButtonRec} |
@@ -78,7 +78,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
78 | 78 | ||
79 | \subsubsection{Keys} | 79 | \subsubsection{Keys} |
80 | \begin{btnmap} | 80 | \begin{btnmap} |
81 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% | 81 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% |
82 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp} | 82 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonUp} |
83 | \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu} | 83 | \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu} |
84 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp} | 84 | \opt{IRIVER_H10_PAD}{\ButtonScrollUp} |
@@ -88,7 +88,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
88 | & Move Forward \\ | 88 | & Move Forward \\ |
89 | % | 89 | % |
90 | \nopt{IPOD_3G_PAD,IPOD_4G_PAD,COWON_D2_PAD}{ | 90 | \nopt{IPOD_3G_PAD,IPOD_4G_PAD,COWON_D2_PAD}{ |
91 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% | 91 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD% |
92 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown} | 92 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonDown} |
93 | \opt{IRIVER_H10_PAD}{\ButtonScrollDown} | 93 | \opt{IRIVER_H10_PAD}{\ButtonScrollDown} |
94 | \opt{COWON_D2_PAD}{\TouchBottomMiddle} | 94 | \opt{COWON_D2_PAD}{\TouchBottomMiddle} |
@@ -97,14 +97,14 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
97 | & Down\\ | 97 | & Down\\ |
98 | } | 98 | } |
99 | % | 99 | % |
100 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD% | 100 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD% |
101 | ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD% | 101 | ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD% |
102 | ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonLeft} | 102 | ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonLeft} |
103 | \opt{COWON_D2_PAD}{\TouchMidLeft} | 103 | \opt{COWON_D2_PAD}{\TouchMidLeft} |
104 | \opt{HAVEREMOTEKEYMAP}{& } | 104 | \opt{HAVEREMOTEKEYMAP}{& } |
105 | & Turn Left \\ | 105 | & Turn Left \\ |
106 | % | 106 | % |
107 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD% | 107 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_CLIP_PAD% |
108 | ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD% | 108 | ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD% |
109 | ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight} | 109 | ,IPOD_3G_PAD,IPOD_4G_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}{\ButtonRight} |
110 | \opt{COWON_D2_PAD}{\TouchMidRight} | 110 | \opt{COWON_D2_PAD}{\TouchMidRight} |
@@ -113,7 +113,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
113 | % | 113 | % |
114 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} | 114 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec} |
115 | \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD}{\ButtonPlay} | 115 | \opt{IPOD_3G_PAD,IPOD_4G_PAD,GIGABEAT_S_PAD}{\ButtonPlay} |
116 | \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonSelect} | 116 | \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonSelect} |
117 | \opt{IRIVER_H10_PAD}{\ButtonRew} | 117 | \opt{IRIVER_H10_PAD}{\ButtonRew} |
118 | \opt{GIGABEAT_PAD}{\ButtonA} | 118 | \opt{GIGABEAT_PAD}{\ButtonA} |
119 | \opt{MROBE100_PAD}{\ButtonDisplay} | 119 | \opt{MROBE100_PAD}{\ButtonDisplay} |
@@ -127,6 +127,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
127 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} | 127 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD}{\ButtonPlay} |
128 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} | 128 | \opt{SANSA_E200_PAD,SANSA_C200_PAD}{\ButtonRec} |
129 | \opt{SANSA_FUZE_PAD}{\ButtonPower} | 129 | \opt{SANSA_FUZE_PAD}{\ButtonPower} |
130 | \opt{SANSA_CLIP_PAD}{\ButtonHome} | ||
130 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu} | 131 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonMenu} |
131 | \opt{PBELL_VIBE500_PAD}{\ButtonOK} | 132 | \opt{PBELL_VIBE500_PAD}{\ButtonOK} |
132 | \opt{HAVEREMOTEKEYMAP}{& } | 133 | \opt{HAVEREMOTEKEYMAP}{& } |
@@ -135,7 +136,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
135 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} | 136 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff} |
136 | \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch} | 137 | \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonHold{} switch} |
137 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD% | 138 | \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD% |
138 | ,GIGABEAT_S_PAD,MROBE100_PAD}{\ButtonPower} | 139 | ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonPower} |
139 | \opt{SANSA_FUZE_PAD}{\ButtonHome} | 140 | \opt{SANSA_FUZE_PAD}{\ButtonHome} |
140 | \opt{COWON_D2_PAD}{\TouchTopLeft} | 141 | \opt{COWON_D2_PAD}{\TouchTopLeft} |
141 | \opt{PBELL_VIBE500_PAD}{\ButtonRec} | 142 | \opt{PBELL_VIBE500_PAD}{\ButtonRec} |
@@ -144,7 +145,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
144 | % | 145 | % |
145 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD% | 146 | \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_3G_PAD,IPOD_4G_PAD,IAUDIO_X5_PAD% |
146 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% | 147 | ,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD% |
147 | ,MROBE100_PAD}{\ButtonSelect} | 148 | ,MROBE100_PAD,SANSA_CLIP_PAD}{\ButtonSelect} |
148 | \opt{IRIVER_H10_PAD}{\ButtonRew} | 149 | \opt{IRIVER_H10_PAD}{\ButtonRew} |
149 | \opt{COWON_D2_PAD}{\TouchCenter} | 150 | \opt{COWON_D2_PAD}{\TouchCenter} |
150 | \opt{PBELL_VIBE500_PAD}{\ButtonPower} | 151 | \opt{PBELL_VIBE500_PAD}{\ButtonPower} |
@@ -156,7 +157,7 @@ Rockdoom options, you will need to quit your current game and restart the plugin | |||
156 | \opt{IAUDIO_X5_PAD}{\ButtonRec} | 157 | \opt{IAUDIO_X5_PAD}{\ButtonRec} |
157 | \opt{IRIVER_H10_PAD}{\ButtonFF} | 158 | \opt{IRIVER_H10_PAD}{\ButtonFF} |
158 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} | 159 | \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd} |
159 | \opt{SANSA_C200_PAD}{\ButtonVolUp} | 160 | \opt{SANSA_C200_PAD,SANSA_CLIP_PAD}{\ButtonVolUp} |
160 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown} | 161 | \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonVolDown} |
161 | \opt{COWON_D2_PAD}{\TouchBottomLeft} | 162 | \opt{COWON_D2_PAD}{\TouchBottomLeft} |
162 | \opt{PBELL_VIBE500_PAD}{\ButtonPlay} | 163 | \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 0000000000..9240d86591 --- /dev/null +++ b/manual/plugins/images/ss-doom-128x64x1-sansaclip.png | |||
Binary files differ | |||