diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-17 18:16:45 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-05-17 18:16:45 +0000 |
commit | ec6476c14adc83869862eef82fa3d4a25b971865 (patch) | |
tree | 9d2635f8076c7b7fe1d9393646fa7a0da3df9e8f | |
parent | c4c7069a8a0b4ffc5de8758c2aa154118449aa62 (diff) | |
download | rockbox-ec6476c14adc83869862eef82fa3d4a25b971865.tar.gz rockbox-ec6476c14adc83869862eef82fa3d4a25b971865.zip |
plugins: reorder SOURCES conditions to be more readable
change a lot of conditions to be more understandable
add some spacing
remove ifp conditions as disabling plugins can be done in configure
SUBDIRS: concatenate some conditions and add comments
No changes expected (no plugins added / removed) for working targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26114 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/SOURCES | 184 | ||||
-rw-r--r-- | apps/plugins/SUBDIRS | 30 |
2 files changed, 123 insertions, 91 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 9ea3db051a..8f06522bc3 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -23,43 +23,118 @@ stopwatch.c | |||
23 | theme_remove.c | 23 | theme_remove.c |
24 | vbrfix.c | 24 | vbrfix.c |
25 | viewer.c | 25 | viewer.c |
26 | md5sum.c | ||
27 | dice.c | ||
28 | disktidy.c | ||
29 | flipit.c | ||
30 | |||
31 | |||
32 | |||
33 | #ifdef USB_ENABLE_HID | ||
34 | remote_control.c | ||
35 | #endif | ||
36 | |||
37 | |||
38 | |||
26 | #ifdef HAVE_BACKLIGHT | 39 | #ifdef HAVE_BACKLIGHT |
27 | lamp.c | 40 | lamp.c |
28 | #endif /* HAVE_BACKLIGHT */ | 41 | #endif /* HAVE_BACKLIGHT */ |
29 | #ifndef SIMULATOR | 42 | |
30 | battery_bench.c | 43 | |
31 | firmware_flash.c | 44 | |
32 | #endif /* SIMULATOR */ | 45 | #if CONFIG_CODEC == SWCODEC |
46 | #if defined(HAVE_RECORDING) && (defined(HAVE_LINE_IN) || defined(HAVE_MIC_IN)) | ||
47 | pitch_detector.c | ||
48 | #endif | ||
49 | |||
50 | mp3_encoder.c | ||
51 | wav2wv.c | ||
52 | #endif /* CONFIG_CODEC */ | ||
53 | |||
54 | |||
55 | #if CONFIG_RTC | ||
56 | alarmclock.c | ||
57 | #endif /* CONFIG_RTC */ | ||
58 | |||
59 | |||
60 | |||
61 | /* Platform-specific */ | ||
62 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | ||
63 | iriverify.c | ||
64 | #endif | ||
65 | |||
66 | |||
67 | |||
68 | #ifndef SIMULATOR /* those plugins only run on hardware */ | ||
69 | |||
70 | /* Overlay loaders */ | ||
71 | |||
72 | #if (MEMORYSIZE <= 8) | ||
73 | chessbox.c | ||
74 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
75 | rockboy.c | ||
76 | #endif | ||
77 | zxbox.c | ||
78 | #endif | ||
79 | |||
80 | /* overlay loader for Goban */ | ||
81 | #if (PLUGIN_BUFFER_SIZE < 0x10000) | ||
82 | lua.c | ||
83 | goban.c | ||
84 | pictureflow.c | ||
85 | #endif | ||
86 | |||
87 | |||
88 | #if CONFIG_CODEC != SWCODEC | ||
89 | |||
90 | #if defined(HAVE_LCD_BITMAP) | ||
91 | splitedit.c | ||
92 | #endif | ||
93 | |||
94 | #if CONFIG_LCD == LCD_SSD1815 | ||
95 | video.c | ||
96 | #endif | ||
97 | |||
98 | #endif /* HWCODEC */ | ||
99 | |||
100 | |||
101 | #if defined(ARCHOS_PLAYER) || defined(ARCHOS_RECORDER) || \ | ||
102 | defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2) | ||
103 | alpine_cdc.c | ||
104 | #endif | ||
105 | |||
106 | #if defined(IRIVER_H100_SERIES) | ||
107 | iriver_flash.c | ||
108 | #endif | ||
109 | |||
33 | #if (CONFIG_CPU == SH7034) | 110 | #if (CONFIG_CPU == SH7034) |
34 | rockbox_flash.c | 111 | rockbox_flash.c |
35 | #endif /* CONFIG_CPU */ | 112 | #endif /* CONFIG_CPU */ |
36 | 113 | ||
37 | #if defined(IPOD_NANO2G) && !defined(SIMULATOR) | 114 | battery_bench.c |
38 | crypt_firmware.c | 115 | firmware_flash.c |
39 | #endif | ||
40 | 116 | ||
41 | #if (CONFIG_CODEC == SWCODEC) && defined(HAVE_RECORDING) && \ | 117 | #if defined(IPOD_NANO2G) |
42 | (defined(HAVE_LINE_IN) || defined(HAVE_MIC_IN)) | 118 | crypt_firmware.c |
43 | pitch_detector.c | ||
44 | #endif | 119 | #endif |
45 | 120 | ||
46 | #if (CONFIG_CODEC == SWCODEC) || !defined(SIMULATOR) | 121 | #if (CONFIG_CODEC == SWCODEC) |
47 | metronome.c | 122 | metronome.c |
48 | #endif | 123 | #endif |
49 | 124 | ||
50 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) && !defined(SIMULATOR) | 125 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) |
51 | wavplay.c | 126 | wavplay.c |
52 | #endif | 127 | #endif |
53 | #if (CONFIG_CODEC == MAS3587F) && !defined(SIMULATOR) | 128 | #if (CONFIG_CODEC == MAS3587F) |
54 | wavrecord.c | 129 | wavrecord.c |
55 | #endif | 130 | #endif |
56 | 131 | ||
57 | #ifndef IRIVER_IFP7XX_SERIES /* Temporarily disable plugins for iFP7xx */ | 132 | #endif /* SIMULATOR */ |
58 | dice.c | 133 | |
59 | disktidy.c | 134 | |
60 | flipit.c | 135 | |
136 | #ifdef HAVE_LCD_BITMAP /* Not for the Archos Player */ | ||
61 | 137 | ||
62 | #ifdef HAVE_LCD_BITMAP /* Not for the Player */ | ||
63 | boomshine.lua | 138 | boomshine.lua |
64 | rockblox1d.c | 139 | rockblox1d.c |
65 | brickmania.c | 140 | brickmania.c |
@@ -69,12 +144,8 @@ mazezam.c | |||
69 | text_editor.c | 144 | text_editor.c |
70 | wavview.c | 145 | wavview.c |
71 | robotfindskitten.c | 146 | robotfindskitten.c |
72 | 147 | xobox.c | |
73 | #ifdef HAVE_LCD_COLOR | 148 | spacerocks.c |
74 | clix.c | ||
75 | ppmviewer.c | ||
76 | codebuster.c | ||
77 | #endif | ||
78 | 149 | ||
79 | /* Plugins needing the grayscale lib on low-depth LCDs */ | 150 | /* Plugins needing the grayscale lib on low-depth LCDs */ |
80 | fire.c | 151 | fire.c |
@@ -99,87 +170,46 @@ solitaire.c | |||
99 | sokoban.c | 170 | sokoban.c |
100 | star.c | 171 | star.c |
101 | starfield.c | 172 | starfield.c |
102 | #if (CONFIG_LCD == LCD_SSD1815) && (CONFIG_CODEC != SWCODEC) && \ | ||
103 | !defined(SIMULATOR) | ||
104 | video.c | ||
105 | #endif | ||
106 | vu_meter.c | 173 | vu_meter.c |
107 | wormlet.c | 174 | wormlet.c |
108 | 175 | ||
109 | #if CONFIG_RTC | 176 | #ifdef HAVE_LCD_COLOR |
110 | alarmclock.c | 177 | clix.c |
111 | #endif /* CONFIG_RTC */ | 178 | ppmviewer.c |
112 | 179 | codebuster.c | |
113 | #if (MEMORYSIZE <= 8) && !defined(SIMULATOR) /* loaders, only needed for Archos */ | ||
114 | chessbox.c | ||
115 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
116 | rockboy.c | ||
117 | #endif | ||
118 | zxbox.c | ||
119 | #endif | ||
120 | |||
121 | /* overlay loader for Goban */ | ||
122 | #if (PLUGIN_BUFFER_SIZE < 0x10000) && !defined(SIMULATOR) | ||
123 | lua.c | ||
124 | goban.c | ||
125 | pictureflow.c | ||
126 | #endif | 180 | #endif |
127 | 181 | ||
128 | /* not support recorder models for now */ | ||
129 | #if (LCD_WIDTH > 112) && (LCD_HEIGHT > 64) | 182 | #if (LCD_WIDTH > 112) && (LCD_HEIGHT > 64) |
130 | fireworks.c | 183 | fireworks.c |
131 | #endif | 184 | #endif |
132 | xobox.c | 185 | |
133 | spacerocks.c | ||
134 | #if LCD_DEPTH >= 16 | 186 | #if LCD_DEPTH >= 16 |
135 | rockpaint.c | 187 | rockpaint.c |
136 | #endif | 188 | #endif |
137 | 189 | ||
138 | rocklife.c | 190 | rocklife.c |
191 | |||
139 | #endif /* HAVE_LCD_BITMAP */ | 192 | #endif /* HAVE_LCD_BITMAP */ |
140 | 193 | ||
141 | #ifdef HAVE_LCD_CHARCELLS /* Player model only */ | 194 | #ifdef HAVE_LCD_CHARCELLS /* Archos Player model only */ |
142 | euroconverter.c | 195 | euroconverter.c |
143 | nim.c | 196 | nim.c |
144 | #endif /* HAVE_LCD_CHARCELLS */ | 197 | #endif /* HAVE_LCD_CHARCELLS */ |
145 | 198 | ||
146 | #if CONFIG_CODEC == SWCODEC /* software codec platforms */ | 199 | |
147 | mp3_encoder.c | ||
148 | wav2wv.c | ||
149 | #else /* hardware codec platforms */ | ||
150 | #if !defined(ARCHOS_ONDIOSP) && !defined(ARCHOS_ONDIOFM) | ||
151 | /* not for Ondio, has no remote control pin */ | ||
152 | alpine_cdc.c | ||
153 | #endif | ||
154 | #if defined(HAVE_LCD_BITMAP) && !defined(SIMULATOR) | ||
155 | splitedit.c | ||
156 | #endif | ||
157 | #endif /* CONFIG_CODEC */ | ||
158 | 200 | ||
159 | #if LCD_DEPTH > 1 /* non-mono bitmap targets */ | 201 | #if LCD_DEPTH > 1 /* non-mono bitmap targets */ |
160 | matrix.c | ||
161 | #endif | ||
162 | 202 | ||
163 | /* Platform-specific plugins */ | 203 | matrix.c |
164 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | ||
165 | iriverify.c | ||
166 | #endif | ||
167 | #if defined(IRIVER_H100_SERIES) && !defined(SIMULATOR) | ||
168 | iriver_flash.c | ||
169 | #endif | ||
170 | 204 | ||
171 | #endif /* iFP7xx */ | 205 | #if (LCD_WIDTH > 138) |
172 | #if (LCD_WIDTH > 138) && (LCD_DEPTH > 1) | ||
173 | /* Built for bitmap targets except H10 5/6gb, Archoses, iPod mini, mrobe100 and ifp*/ | ||
174 | invadrox.c | 206 | invadrox.c |
175 | superdom.c | 207 | superdom.c |
176 | #endif | 208 | #endif |
177 | 209 | ||
178 | md5sum.c | 210 | #endif /* LCD_DEPTH > 1 */ |
211 | |||
179 | 212 | ||
180 | #ifdef USB_ENABLE_HID | ||
181 | remote_control.c | ||
182 | #endif | ||
183 | 213 | ||
184 | #ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */ | 214 | #ifdef HAVE_TEST_PLUGINS /* enable in advanced build options */ |
185 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 215 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index 1c7f969c02..2a88e7d1b1 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -1,5 +1,3 @@ | |||
1 | #if !defined(IRIVER_IFP7XX_SERIES) | ||
2 | |||
3 | /* For all targets */ | 1 | /* For all targets */ |
4 | shortcuts | 2 | shortcuts |
5 | 3 | ||
@@ -10,32 +8,38 @@ clock | |||
10 | #endif | 8 | #endif |
11 | 9 | ||
12 | #if (CONFIG_KEYPAD == RECORDER_PAD) || defined(HAVE_LCD_COLOR) \ | 10 | #if (CONFIG_KEYPAD == RECORDER_PAD) || defined(HAVE_LCD_COLOR) \ |
13 | || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5) | 11 | || defined(IRIVER_H100_SERIES) || defined(IAUDIO_M5) /* FIXME */ |
14 | rockboy | 12 | rockboy |
15 | #endif | 13 | #endif |
16 | 14 | ||
17 | /* For all targets with a bitmap display */ | 15 | /* For all targets with a bitmap display */ |
18 | #ifdef HAVE_LCD_BITMAP | 16 | #ifdef HAVE_LCD_BITMAP |
17 | |||
19 | #ifdef HAVE_TAGCACHE | 18 | #ifdef HAVE_TAGCACHE |
20 | pictureflow | 19 | pictureflow |
21 | #endif | 20 | #endif |
21 | |||
22 | #if (CONFIG_CODEC == SWCODEC) | 22 | #if (CONFIG_CODEC == SWCODEC) |
23 | fft | 23 | fft |
24 | #endif | 24 | #endif |
25 | |||
25 | chessbox | 26 | chessbox |
26 | fractals | 27 | fractals |
27 | imageviewer | 28 | imageviewer |
28 | sudoku | 29 | sudoku |
29 | reversi | 30 | reversi |
30 | goban | 31 | goban |
32 | |||
31 | /* setjmp/longjmp are not implemented on sh */ | 33 | /* setjmp/longjmp are not implemented on sh */ |
32 | #if (CONFIG_CPU != SH7034) | 34 | #if (CONFIG_CPU != SH7034) |
33 | frotz | 35 | frotz |
34 | #endif | 36 | #endif |
37 | |||
35 | #ifndef OLYMPUS_MROBE_500 | 38 | #ifndef OLYMPUS_MROBE_500 |
36 | zxbox | 39 | zxbox |
37 | #endif | 40 | #endif |
38 | #endif | 41 | |
42 | #endif /* HAVE_LCD_BITMAP */ | ||
39 | 43 | ||
40 | /* For all big enough colour screens, iriver H1x0 and iAudio M5 */ | 44 | /* For all big enough colour screens, iriver H1x0 and iAudio M5 */ |
41 | #if defined(HAVE_LCD_COLOR) && LCD_HEIGHT > 96\ | 45 | #if defined(HAVE_LCD_COLOR) && LCD_HEIGHT > 96\ |
@@ -43,32 +47,30 @@ zxbox | |||
43 | pacbox | 47 | pacbox |
44 | #endif | 48 | #endif |
45 | 49 | ||
46 | /* For all the color targets */ | ||
47 | #if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ | 50 | #if (defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \ |
48 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) | 51 | (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)) && (MEMORYSIZE > 2) && \ |
49 | #ifndef RB_PROFILE | 52 | !defined(RB_PROFILE) |
50 | doom | 53 | doom |
51 | #endif | 54 | #endif |
52 | #endif | ||
53 | 55 | ||
54 | /* For all the swcodec targets */ | 56 | /* For all the swcodec targets */ |
55 | #if CONFIG_CODEC == SWCODEC | 57 | #if CONFIG_CODEC == SWCODEC |
58 | |||
56 | midi | 59 | midi |
60 | |||
57 | /* beatbox */ | 61 | /* beatbox */ |
58 | #if defined(IRIVER_H300_SERIES) || defined(IRIVER_H100_SERIES) | 62 | #if defined(IRIVER_H300_SERIES) || defined(IRIVER_H100_SERIES) |
59 | /* PDBox is confirmed to run on these player models. */ | 63 | /* PDBox is confirmed to run on these player models. */ |
60 | pdbox | 64 | pdbox |
61 | #endif | 65 | #endif |
62 | #ifndef RB_PROFILE | 66 | |
63 | #if MEMORYSIZE > 2 /* mpegplayer allocates at least 2MB of RAM */ | 67 | #if !defined(RB_PROFILE) && MEMORYSIZE > 2 /* mpegplayer allocates at least 2MB of RAM */ |
64 | mpegplayer | 68 | mpegplayer |
65 | #endif | 69 | #endif |
66 | #endif | 70 | |
67 | #endif | 71 | #endif /* CONFIG_CODEC == SWCODEC */ |
68 | 72 | ||
69 | /* Lua needs at least 160 KB to work in */ | 73 | /* Lua needs at least 160 KB to work in */ |
70 | #if (PLUGIN_BUFFER_SIZE >= 0x80000) | 74 | #if (PLUGIN_BUFFER_SIZE >= 0x80000) |
71 | lua | 75 | lua |
72 | #endif | 76 | #endif |
73 | |||
74 | #endif /* IRIVER_IFP7XX_SERIES */ | ||