diff options
author | Sean Bartell <wingedtachikoma@gmail.com> | 2011-06-24 01:25:21 -0400 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2012-03-18 12:00:39 +0100 |
commit | b5716df4cb2837bbbc42195cf1aefcf03e21d6a6 (patch) | |
tree | 130cd712e2e00893b6df9959a375a8d9523a1aca | |
parent | 24bd9d5393dbe39a5c6194877bc00ede669b1d5d (diff) | |
download | rockbox-b5716df4cb2837bbbc42195cf1aefcf03e21d6a6.tar.gz rockbox-b5716df4cb2837bbbc42195cf1aefcf03e21d6a6.zip |
Build librbcodec with DSP and metadata.
All associated files are moved to /lib/rbcodec.
Change-Id: I572ddd2b8a996aae1e98c081d06b1ed356dce222
-rw-r--r-- | apps/SOURCES | 54 | ||||
-rw-r--r-- | apps/fracmul.h | 2 | ||||
-rw-r--r-- | apps/plugins/lrcplayer.c | 1 | ||||
-rw-r--r-- | lib/rbcodec/SOURCES | 54 | ||||
-rw-r--r-- | lib/rbcodec/dsp/compressor.c (renamed from apps/compressor.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/compressor.h (renamed from apps/compressor.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp.c (renamed from apps/dsp.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp.h (renamed from apps/dsp.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_arm.S (renamed from apps/dsp_arm.S) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_arm_v6.S (renamed from apps/dsp_arm_v6.S) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_asm.h (renamed from apps/dsp_asm.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/dsp_cf.S (renamed from apps/dsp_cf.S) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eq.c (renamed from apps/eq.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eq.h (renamed from apps/eq.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eq_arm.S (renamed from apps/eq_arm.S) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eq_cf.S (renamed from apps/eq_cf.S) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Acoustic.cfg (renamed from apps/eqs/Acoustic.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Bass.cfg (renamed from apps/eqs/Bass.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Classical.cfg (renamed from apps/eqs/Classical.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Default.cfg (renamed from apps/eqs/Default.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Disco.cfg (renamed from apps/eqs/Disco.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Electronic.cfg (renamed from apps/eqs/Electronic.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Hip-Hop.cfg (renamed from apps/eqs/Hip-Hop.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Jazz.cfg (renamed from apps/eqs/Jazz.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Lounge.cfg (renamed from apps/eqs/Lounge.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Pop.cfg (renamed from apps/eqs/Pop.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/R&B.cfg (renamed from apps/eqs/R&B.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Rock.cfg (renamed from apps/eqs/Rock.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/eqs/Vocal.cfg (renamed from apps/eqs/Vocal.cfg) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/tdspeed.c (renamed from apps/tdspeed.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/dsp/tdspeed.h (renamed from apps/tdspeed.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/a52.c (renamed from apps/metadata/a52.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/adx.c (renamed from apps/metadata/adx.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/aiff.c (renamed from apps/metadata/aiff.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/ape.c (renamed from apps/metadata/ape.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/asap.c (renamed from apps/metadata/asap.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/asf.c (renamed from apps/metadata/asf.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/au.c (renamed from apps/metadata/au.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/ay.c (renamed from apps/metadata/ay.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/flac.c (renamed from apps/metadata/flac.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/gbs.c (renamed from apps/metadata/gbs.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/hes.c (renamed from apps/metadata/hes.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/id3tags.c (renamed from apps/metadata/id3tags.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/kss.c (renamed from apps/metadata/kss.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata.c (renamed from apps/metadata.c) | 2 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata.h (renamed from apps/metadata.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata_common.c (renamed from apps/metadata/metadata_common.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata_common.h (renamed from apps/metadata/metadata_common.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata_parsers.h (renamed from apps/metadata/metadata_parsers.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/mod.c (renamed from apps/metadata/mod.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/monkeys.c (renamed from apps/metadata/monkeys.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/mp3.c (renamed from apps/metadata/mp3.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/mp3data.c (renamed from apps/mp3data.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/mp3data.h (renamed from apps/mp3data.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/mp4.c (renamed from apps/metadata/mp4.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/mpc.c (renamed from apps/metadata/mpc.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/nsf.c (renamed from apps/metadata/nsf.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/ogg.c (renamed from apps/metadata/ogg.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/oma.c (renamed from apps/metadata/oma.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/replaygain.c (renamed from apps/replaygain.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/replaygain.h (renamed from apps/replaygain.h) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/rm.c (renamed from apps/metadata/rm.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/sgc.c (renamed from apps/metadata/sgc.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/sid.c (renamed from apps/metadata/sid.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/smaf.c (renamed from apps/metadata/smaf.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/spc.c (renamed from apps/metadata/spc.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/tta.c (renamed from apps/metadata/tta.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/vgm.c (renamed from apps/metadata/vgm.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/vorbis.c (renamed from apps/metadata/vorbis.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/vox.c (renamed from apps/metadata/vox.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/wave.c (renamed from apps/metadata/wave.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/metadata/wavpack.c (renamed from apps/metadata/wavpack.c) | 0 | ||||
-rw-r--r-- | lib/rbcodec/rbcodec.make | 19 | ||||
-rw-r--r-- | lib/rbcodec/test/SOURCES | 41 | ||||
-rw-r--r-- | lib/rbcodec/test/warble.make | 8 | ||||
-rwxr-xr-x | tools/buildzip.pl | 2 | ||||
-rw-r--r-- | tools/database/SOURCES | 11 | ||||
-rw-r--r-- | tools/database/database.make | 4 | ||||
-rw-r--r-- | tools/root.make | 9 | ||||
-rw-r--r-- | uisimulator/uisimulator.make | 2 |
80 files changed, 97 insertions, 112 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index e1990217ca..45eb0768a3 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -26,7 +26,6 @@ menus/audiohw_eq_menu.c | |||
26 | menus/eq_menu.c | 26 | menus/eq_menu.c |
27 | buffering.c | 27 | buffering.c |
28 | voice_thread.c | 28 | voice_thread.c |
29 | replaygain.c | ||
30 | #else /* !SWCODEC */ | 29 | #else /* !SWCODEC */ |
31 | mpeg.c | 30 | mpeg.c |
32 | #endif | 31 | #endif |
@@ -42,7 +41,6 @@ menus/sound_menu.c | |||
42 | menus/time_menu.c | 41 | menus/time_menu.c |
43 | #endif | 42 | #endif |
44 | misc.c | 43 | misc.c |
45 | mp3data.c | ||
46 | onplay.c | 44 | onplay.c |
47 | playlist.c | 45 | playlist.c |
48 | playlist_catalog.c | 46 | playlist_catalog.c |
@@ -168,29 +166,13 @@ pcmbuf.c | |||
168 | codec_thread.c | 166 | codec_thread.c |
169 | playback.c | 167 | playback.c |
170 | codecs.c | 168 | codecs.c |
171 | dsp.c | ||
172 | compressor.c | ||
173 | #ifndef HAVE_HARDWARE_BEEP | 169 | #ifndef HAVE_HARDWARE_BEEP |
174 | beep.c | 170 | beep.c |
175 | #endif | 171 | #endif |
176 | #ifdef HAVE_PITCHSCREEN | ||
177 | tdspeed.c | ||
178 | #endif | ||
179 | #ifdef HAVE_RECORDING | 172 | #ifdef HAVE_RECORDING |
180 | enc_config.c | 173 | enc_config.c |
181 | recorder/pcm_record.c | 174 | recorder/pcm_record.c |
182 | #endif | 175 | #endif |
183 | eq.c | ||
184 | #if defined(CPU_COLDFIRE) | ||
185 | dsp_cf.S | ||
186 | eq_cf.S | ||
187 | #elif defined(CPU_ARM) | ||
188 | dsp_arm.S | ||
189 | #if ARM_ARCH >= 6 | ||
190 | dsp_arm_v6.S | ||
191 | #endif | ||
192 | eq_arm.S | ||
193 | #endif | ||
194 | #endif | 176 | #endif |
195 | #ifdef USB_ENABLE_HID | 177 | #ifdef USB_ENABLE_HID |
196 | usb_keymaps.c | 178 | usb_keymaps.c |
@@ -198,42 +180,6 @@ usb_keymaps.c | |||
198 | #ifndef USB_NONE | 180 | #ifndef USB_NONE |
199 | gui/usb_screen.c | 181 | gui/usb_screen.c |
200 | #endif | 182 | #endif |
201 | metadata.c | ||
202 | metadata/id3tags.c | ||
203 | metadata/mp3.c | ||
204 | #if CONFIG_CODEC == SWCODEC | ||
205 | metadata/metadata_common.c | ||
206 | metadata/aiff.c | ||
207 | metadata/ape.c | ||
208 | metadata/asf.c | ||
209 | metadata/adx.c | ||
210 | metadata/flac.c | ||
211 | metadata/monkeys.c | ||
212 | metadata/mp4.c | ||
213 | metadata/mpc.c | ||
214 | metadata/ogg.c | ||
215 | metadata/sid.c | ||
216 | metadata/mod.c | ||
217 | metadata/spc.c | ||
218 | metadata/vorbis.c | ||
219 | metadata/wave.c | ||
220 | metadata/wavpack.c | ||
221 | metadata/a52.c | ||
222 | metadata/asap.c | ||
223 | metadata/rm.c | ||
224 | metadata/nsf.c | ||
225 | metadata/oma.c | ||
226 | metadata/smaf.c | ||
227 | metadata/au.c | ||
228 | metadata/vox.c | ||
229 | metadata/tta.c | ||
230 | metadata/ay.c | ||
231 | metadata/gbs.c | ||
232 | metadata/hes.c | ||
233 | metadata/sgc.c | ||
234 | metadata/vgm.c | ||
235 | metadata/kss.c | ||
236 | #endif | ||
237 | #ifdef HAVE_TAGCACHE | 183 | #ifdef HAVE_TAGCACHE |
238 | tagcache.c | 184 | tagcache.c |
239 | #endif | 185 | #endif |
diff --git a/apps/fracmul.h b/apps/fracmul.h index 6aaedaf3e6..47b85e59ef 100644 --- a/apps/fracmul.h +++ b/apps/fracmul.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <stdint.h> | 4 | #include <stdint.h> |
5 | #include "gcc_extensions.h" | 5 | #include "gcc_extensions.h" |
6 | 6 | ||
7 | /** FRACTIONAL MULTIPLICATION - TAKEN FROM apps/dsp.h | 7 | /** FRACTIONAL MULTIPLICATION |
8 | * Multiply two fixed point numbers with 31 fractional bits: | 8 | * Multiply two fixed point numbers with 31 fractional bits: |
9 | * FRACMUL(x, y) | 9 | * FRACMUL(x, y) |
10 | * | 10 | * |
diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c index cc0128b401..97385ff047 100644 --- a/apps/plugins/lrcplayer.c +++ b/apps/plugins/lrcplayer.c | |||
@@ -1113,7 +1113,6 @@ static void load_lrc_file(void) | |||
1113 | /******************************* | 1113 | /******************************* |
1114 | * read lyrics from id3 | 1114 | * read lyrics from id3 |
1115 | *******************************/ | 1115 | *******************************/ |
1116 | /* taken from apps/metadata/mp3.c */ | ||
1117 | static unsigned long unsync(unsigned long b0, unsigned long b1, | 1116 | static unsigned long unsync(unsigned long b0, unsigned long b1, |
1118 | unsigned long b2, unsigned long b3) | 1117 | unsigned long b2, unsigned long b3) |
1119 | { | 1118 | { |
diff --git a/lib/rbcodec/SOURCES b/lib/rbcodec/SOURCES new file mode 100644 index 0000000000..3ac2660a38 --- /dev/null +++ b/lib/rbcodec/SOURCES | |||
@@ -0,0 +1,54 @@ | |||
1 | metadata/metadata.c | ||
2 | metadata/id3tags.c | ||
3 | metadata/mp3.c | ||
4 | metadata/mp3data.c | ||
5 | #if CONFIG_CODEC == SWCODEC | ||
6 | dsp/compressor.c | ||
7 | dsp/dsp.c | ||
8 | dsp/eq.c | ||
9 | # if defined(CPU_COLDFIRE) | ||
10 | dsp/dsp_cf.S | ||
11 | dsp/eq_cf.S | ||
12 | # elif defined(CPU_ARM) | ||
13 | dsp/dsp_arm.S | ||
14 | dsp/eq_arm.S | ||
15 | # if ARM_ARCH >= 6 | ||
16 | dsp/dsp_arm_v6.S | ||
17 | # endif | ||
18 | # endif | ||
19 | # ifdef HAVE_PITCHSCREEN | ||
20 | dsp/tdspeed.c | ||
21 | # endif | ||
22 | metadata/replaygain.c | ||
23 | metadata/metadata_common.c | ||
24 | metadata/a52.c | ||
25 | metadata/adx.c | ||
26 | metadata/aiff.c | ||
27 | metadata/ape.c | ||
28 | metadata/asap.c | ||
29 | metadata/asf.c | ||
30 | metadata/au.c | ||
31 | metadata/ay.c | ||
32 | metadata/flac.c | ||
33 | metadata/gbs.c | ||
34 | metadata/hes.c | ||
35 | metadata/kss.c | ||
36 | metadata/mod.c | ||
37 | metadata/monkeys.c | ||
38 | metadata/mp4.c | ||
39 | metadata/mpc.c | ||
40 | metadata/nsf.c | ||
41 | metadata/ogg.c | ||
42 | metadata/oma.c | ||
43 | metadata/rm.c | ||
44 | metadata/sgc.c | ||
45 | metadata/sid.c | ||
46 | metadata/smaf.c | ||
47 | metadata/spc.c | ||
48 | metadata/tta.c | ||
49 | metadata/vgm.c | ||
50 | metadata/vorbis.c | ||
51 | metadata/vox.c | ||
52 | metadata/wave.c | ||
53 | metadata/wavpack.c | ||
54 | #endif | ||
diff --git a/apps/compressor.c b/lib/rbcodec/dsp/compressor.c index 3a8d52e4da..3a8d52e4da 100644 --- a/apps/compressor.c +++ b/lib/rbcodec/dsp/compressor.c | |||
diff --git a/apps/compressor.h b/lib/rbcodec/dsp/compressor.h index 6154372e05..6154372e05 100644 --- a/apps/compressor.h +++ b/lib/rbcodec/dsp/compressor.h | |||
diff --git a/apps/dsp.c b/lib/rbcodec/dsp/dsp.c index 4da555747b..4da555747b 100644 --- a/apps/dsp.c +++ b/lib/rbcodec/dsp/dsp.c | |||
diff --git a/apps/dsp.h b/lib/rbcodec/dsp/dsp.h index 2a00f649f8..2a00f649f8 100644 --- a/apps/dsp.h +++ b/lib/rbcodec/dsp/dsp.h | |||
diff --git a/apps/dsp_arm.S b/lib/rbcodec/dsp/dsp_arm.S index 7e360749a3..7e360749a3 100644 --- a/apps/dsp_arm.S +++ b/lib/rbcodec/dsp/dsp_arm.S | |||
diff --git a/apps/dsp_arm_v6.S b/lib/rbcodec/dsp/dsp_arm_v6.S index 39949498ea..39949498ea 100644 --- a/apps/dsp_arm_v6.S +++ b/lib/rbcodec/dsp/dsp_arm_v6.S | |||
diff --git a/apps/dsp_asm.h b/lib/rbcodec/dsp/dsp_asm.h index 7bf18370a3..7bf18370a3 100644 --- a/apps/dsp_asm.h +++ b/lib/rbcodec/dsp/dsp_asm.h | |||
diff --git a/apps/dsp_cf.S b/lib/rbcodec/dsp/dsp_cf.S index cda811a7d5..cda811a7d5 100644 --- a/apps/dsp_cf.S +++ b/lib/rbcodec/dsp/dsp_cf.S | |||
diff --git a/apps/eq.c b/lib/rbcodec/dsp/eq.c index 122a46a4c5..122a46a4c5 100644 --- a/apps/eq.c +++ b/lib/rbcodec/dsp/eq.c | |||
diff --git a/apps/eq.h b/lib/rbcodec/dsp/eq.h index a44e9153ac..a44e9153ac 100644 --- a/apps/eq.h +++ b/lib/rbcodec/dsp/eq.h | |||
diff --git a/apps/eq_arm.S b/lib/rbcodec/dsp/eq_arm.S index b0e1771e89..b0e1771e89 100644 --- a/apps/eq_arm.S +++ b/lib/rbcodec/dsp/eq_arm.S | |||
diff --git a/apps/eq_cf.S b/lib/rbcodec/dsp/eq_cf.S index 30a28b9d99..30a28b9d99 100644 --- a/apps/eq_cf.S +++ b/lib/rbcodec/dsp/eq_cf.S | |||
diff --git a/apps/eqs/Acoustic.cfg b/lib/rbcodec/dsp/eqs/Acoustic.cfg index 34b5ed8a2b..34b5ed8a2b 100644 --- a/apps/eqs/Acoustic.cfg +++ b/lib/rbcodec/dsp/eqs/Acoustic.cfg | |||
diff --git a/apps/eqs/Bass.cfg b/lib/rbcodec/dsp/eqs/Bass.cfg index 2742459081..2742459081 100644 --- a/apps/eqs/Bass.cfg +++ b/lib/rbcodec/dsp/eqs/Bass.cfg | |||
diff --git a/apps/eqs/Classical.cfg b/lib/rbcodec/dsp/eqs/Classical.cfg index bf2f9f9566..bf2f9f9566 100644 --- a/apps/eqs/Classical.cfg +++ b/lib/rbcodec/dsp/eqs/Classical.cfg | |||
diff --git a/apps/eqs/Default.cfg b/lib/rbcodec/dsp/eqs/Default.cfg index d6f345fa9e..d6f345fa9e 100644 --- a/apps/eqs/Default.cfg +++ b/lib/rbcodec/dsp/eqs/Default.cfg | |||
diff --git a/apps/eqs/Disco.cfg b/lib/rbcodec/dsp/eqs/Disco.cfg index f894f26da1..f894f26da1 100644 --- a/apps/eqs/Disco.cfg +++ b/lib/rbcodec/dsp/eqs/Disco.cfg | |||
diff --git a/apps/eqs/Electronic.cfg b/lib/rbcodec/dsp/eqs/Electronic.cfg index e70c911272..e70c911272 100644 --- a/apps/eqs/Electronic.cfg +++ b/lib/rbcodec/dsp/eqs/Electronic.cfg | |||
diff --git a/apps/eqs/Hip-Hop.cfg b/lib/rbcodec/dsp/eqs/Hip-Hop.cfg index 2d38425dc4..2d38425dc4 100644 --- a/apps/eqs/Hip-Hop.cfg +++ b/lib/rbcodec/dsp/eqs/Hip-Hop.cfg | |||
diff --git a/apps/eqs/Jazz.cfg b/lib/rbcodec/dsp/eqs/Jazz.cfg index f576f9fcc1..f576f9fcc1 100644 --- a/apps/eqs/Jazz.cfg +++ b/lib/rbcodec/dsp/eqs/Jazz.cfg | |||
diff --git a/apps/eqs/Lounge.cfg b/lib/rbcodec/dsp/eqs/Lounge.cfg index 39ae23a7e7..39ae23a7e7 100644 --- a/apps/eqs/Lounge.cfg +++ b/lib/rbcodec/dsp/eqs/Lounge.cfg | |||
diff --git a/apps/eqs/Pop.cfg b/lib/rbcodec/dsp/eqs/Pop.cfg index 1d8cefe173..1d8cefe173 100644 --- a/apps/eqs/Pop.cfg +++ b/lib/rbcodec/dsp/eqs/Pop.cfg | |||
diff --git a/apps/eqs/R&B.cfg b/lib/rbcodec/dsp/eqs/R&B.cfg index a460b587f5..a460b587f5 100644 --- a/apps/eqs/R&B.cfg +++ b/lib/rbcodec/dsp/eqs/R&B.cfg | |||
diff --git a/apps/eqs/Rock.cfg b/lib/rbcodec/dsp/eqs/Rock.cfg index ec4f0356a8..ec4f0356a8 100644 --- a/apps/eqs/Rock.cfg +++ b/lib/rbcodec/dsp/eqs/Rock.cfg | |||
diff --git a/apps/eqs/Vocal.cfg b/lib/rbcodec/dsp/eqs/Vocal.cfg index 1de754f07c..1de754f07c 100644 --- a/apps/eqs/Vocal.cfg +++ b/lib/rbcodec/dsp/eqs/Vocal.cfg | |||
diff --git a/apps/tdspeed.c b/lib/rbcodec/dsp/tdspeed.c index 731be12621..731be12621 100644 --- a/apps/tdspeed.c +++ b/lib/rbcodec/dsp/tdspeed.c | |||
diff --git a/apps/tdspeed.h b/lib/rbcodec/dsp/tdspeed.h index e91eeb1701..e91eeb1701 100644 --- a/apps/tdspeed.h +++ b/lib/rbcodec/dsp/tdspeed.h | |||
diff --git a/apps/metadata/a52.c b/lib/rbcodec/metadata/a52.c index a8aad3fa4f..a8aad3fa4f 100644 --- a/apps/metadata/a52.c +++ b/lib/rbcodec/metadata/a52.c | |||
diff --git a/apps/metadata/adx.c b/lib/rbcodec/metadata/adx.c index 7c341b4835..7c341b4835 100644 --- a/apps/metadata/adx.c +++ b/lib/rbcodec/metadata/adx.c | |||
diff --git a/apps/metadata/aiff.c b/lib/rbcodec/metadata/aiff.c index 654f37cf98..654f37cf98 100644 --- a/apps/metadata/aiff.c +++ b/lib/rbcodec/metadata/aiff.c | |||
diff --git a/apps/metadata/ape.c b/lib/rbcodec/metadata/ape.c index 0bd2477431..0bd2477431 100644 --- a/apps/metadata/ape.c +++ b/lib/rbcodec/metadata/ape.c | |||
diff --git a/apps/metadata/asap.c b/lib/rbcodec/metadata/asap.c index 9e7f227031..9e7f227031 100644 --- a/apps/metadata/asap.c +++ b/lib/rbcodec/metadata/asap.c | |||
diff --git a/apps/metadata/asf.c b/lib/rbcodec/metadata/asf.c index b815c09769..b815c09769 100644 --- a/apps/metadata/asf.c +++ b/lib/rbcodec/metadata/asf.c | |||
diff --git a/apps/metadata/au.c b/lib/rbcodec/metadata/au.c index 94e7453644..94e7453644 100644 --- a/apps/metadata/au.c +++ b/lib/rbcodec/metadata/au.c | |||
diff --git a/apps/metadata/ay.c b/lib/rbcodec/metadata/ay.c index 5d00264b3d..5d00264b3d 100644 --- a/apps/metadata/ay.c +++ b/lib/rbcodec/metadata/ay.c | |||
diff --git a/apps/metadata/flac.c b/lib/rbcodec/metadata/flac.c index 29937173fd..29937173fd 100644 --- a/apps/metadata/flac.c +++ b/lib/rbcodec/metadata/flac.c | |||
diff --git a/apps/metadata/gbs.c b/lib/rbcodec/metadata/gbs.c index 68f2b2a393..68f2b2a393 100644 --- a/apps/metadata/gbs.c +++ b/lib/rbcodec/metadata/gbs.c | |||
diff --git a/apps/metadata/hes.c b/lib/rbcodec/metadata/hes.c index 6d99d523cb..6d99d523cb 100644 --- a/apps/metadata/hes.c +++ b/lib/rbcodec/metadata/hes.c | |||
diff --git a/apps/metadata/id3tags.c b/lib/rbcodec/metadata/id3tags.c index 2dd1c662ed..2dd1c662ed 100644 --- a/apps/metadata/id3tags.c +++ b/lib/rbcodec/metadata/id3tags.c | |||
diff --git a/apps/metadata/kss.c b/lib/rbcodec/metadata/kss.c index 2ae0cf50b0..2ae0cf50b0 100644 --- a/apps/metadata/kss.c +++ b/lib/rbcodec/metadata/kss.c | |||
diff --git a/apps/metadata.c b/lib/rbcodec/metadata/metadata.c index 2a93c1880c..b91e00cc4e 100644 --- a/apps/metadata.c +++ b/lib/rbcodec/metadata/metadata.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "cuesheet.h" | 29 | #include "cuesheet.h" |
30 | #include "metadata.h" | 30 | #include "metadata.h" |
31 | 31 | ||
32 | #include "metadata/metadata_parsers.h" | 32 | #include "metadata_parsers.h" |
33 | 33 | ||
34 | #if CONFIG_CODEC == SWCODEC | 34 | #if CONFIG_CODEC == SWCODEC |
35 | 35 | ||
diff --git a/apps/metadata.h b/lib/rbcodec/metadata/metadata.h index 55e4d76f25..55e4d76f25 100644 --- a/apps/metadata.h +++ b/lib/rbcodec/metadata/metadata.h | |||
diff --git a/apps/metadata/metadata_common.c b/lib/rbcodec/metadata/metadata_common.c index e861644025..e861644025 100644 --- a/apps/metadata/metadata_common.c +++ b/lib/rbcodec/metadata/metadata_common.c | |||
diff --git a/apps/metadata/metadata_common.h b/lib/rbcodec/metadata/metadata_common.h index db91729de4..db91729de4 100644 --- a/apps/metadata/metadata_common.h +++ b/lib/rbcodec/metadata/metadata_common.h | |||
diff --git a/apps/metadata/metadata_parsers.h b/lib/rbcodec/metadata/metadata_parsers.h index 304e393538..304e393538 100644 --- a/apps/metadata/metadata_parsers.h +++ b/lib/rbcodec/metadata/metadata_parsers.h | |||
diff --git a/apps/metadata/mod.c b/lib/rbcodec/metadata/mod.c index de76823e91..de76823e91 100644 --- a/apps/metadata/mod.c +++ b/lib/rbcodec/metadata/mod.c | |||
diff --git a/apps/metadata/monkeys.c b/lib/rbcodec/metadata/monkeys.c index 4aff1412aa..4aff1412aa 100644 --- a/apps/metadata/monkeys.c +++ b/lib/rbcodec/metadata/monkeys.c | |||
diff --git a/apps/metadata/mp3.c b/lib/rbcodec/metadata/mp3.c index feb1a52f77..feb1a52f77 100644 --- a/apps/metadata/mp3.c +++ b/lib/rbcodec/metadata/mp3.c | |||
diff --git a/apps/mp3data.c b/lib/rbcodec/metadata/mp3data.c index 13ff0a87a7..13ff0a87a7 100644 --- a/apps/mp3data.c +++ b/lib/rbcodec/metadata/mp3data.c | |||
diff --git a/apps/mp3data.h b/lib/rbcodec/metadata/mp3data.h index 762c2f4583..762c2f4583 100644 --- a/apps/mp3data.h +++ b/lib/rbcodec/metadata/mp3data.h | |||
diff --git a/apps/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c index df164436f5..df164436f5 100644 --- a/apps/metadata/mp4.c +++ b/lib/rbcodec/metadata/mp4.c | |||
diff --git a/apps/metadata/mpc.c b/lib/rbcodec/metadata/mpc.c index 0b75ed04dd..0b75ed04dd 100644 --- a/apps/metadata/mpc.c +++ b/lib/rbcodec/metadata/mpc.c | |||
diff --git a/apps/metadata/nsf.c b/lib/rbcodec/metadata/nsf.c index 2fa6f36b12..2fa6f36b12 100644 --- a/apps/metadata/nsf.c +++ b/lib/rbcodec/metadata/nsf.c | |||
diff --git a/apps/metadata/ogg.c b/lib/rbcodec/metadata/ogg.c index 3a3cb29998..3a3cb29998 100644 --- a/apps/metadata/ogg.c +++ b/lib/rbcodec/metadata/ogg.c | |||
diff --git a/apps/metadata/oma.c b/lib/rbcodec/metadata/oma.c index b82c0a4f73..b82c0a4f73 100644 --- a/apps/metadata/oma.c +++ b/lib/rbcodec/metadata/oma.c | |||
diff --git a/apps/replaygain.c b/lib/rbcodec/metadata/replaygain.c index a178321385..a178321385 100644 --- a/apps/replaygain.c +++ b/lib/rbcodec/metadata/replaygain.c | |||
diff --git a/apps/replaygain.h b/lib/rbcodec/metadata/replaygain.h index 215464dfdf..215464dfdf 100644 --- a/apps/replaygain.h +++ b/lib/rbcodec/metadata/replaygain.h | |||
diff --git a/apps/metadata/rm.c b/lib/rbcodec/metadata/rm.c index 27f541cb25..27f541cb25 100644 --- a/apps/metadata/rm.c +++ b/lib/rbcodec/metadata/rm.c | |||
diff --git a/apps/metadata/sgc.c b/lib/rbcodec/metadata/sgc.c index 78cacb9b1b..78cacb9b1b 100644 --- a/apps/metadata/sgc.c +++ b/lib/rbcodec/metadata/sgc.c | |||
diff --git a/apps/metadata/sid.c b/lib/rbcodec/metadata/sid.c index 50b879b56d..50b879b56d 100644 --- a/apps/metadata/sid.c +++ b/lib/rbcodec/metadata/sid.c | |||
diff --git a/apps/metadata/smaf.c b/lib/rbcodec/metadata/smaf.c index 1b745d3fa1..1b745d3fa1 100644 --- a/apps/metadata/smaf.c +++ b/lib/rbcodec/metadata/smaf.c | |||
diff --git a/apps/metadata/spc.c b/lib/rbcodec/metadata/spc.c index 1c0206205d..1c0206205d 100644 --- a/apps/metadata/spc.c +++ b/lib/rbcodec/metadata/spc.c | |||
diff --git a/apps/metadata/tta.c b/lib/rbcodec/metadata/tta.c index 1d3d95f118..1d3d95f118 100644 --- a/apps/metadata/tta.c +++ b/lib/rbcodec/metadata/tta.c | |||
diff --git a/apps/metadata/vgm.c b/lib/rbcodec/metadata/vgm.c index 9ea95b3939..9ea95b3939 100644 --- a/apps/metadata/vgm.c +++ b/lib/rbcodec/metadata/vgm.c | |||
diff --git a/apps/metadata/vorbis.c b/lib/rbcodec/metadata/vorbis.c index 58bd781873..58bd781873 100644 --- a/apps/metadata/vorbis.c +++ b/lib/rbcodec/metadata/vorbis.c | |||
diff --git a/apps/metadata/vox.c b/lib/rbcodec/metadata/vox.c index f6bc849a88..f6bc849a88 100644 --- a/apps/metadata/vox.c +++ b/lib/rbcodec/metadata/vox.c | |||
diff --git a/apps/metadata/wave.c b/lib/rbcodec/metadata/wave.c index 45acea1fa1..45acea1fa1 100644 --- a/apps/metadata/wave.c +++ b/lib/rbcodec/metadata/wave.c | |||
diff --git a/apps/metadata/wavpack.c b/lib/rbcodec/metadata/wavpack.c index f2811df8f3..f2811df8f3 100644 --- a/apps/metadata/wavpack.c +++ b/lib/rbcodec/metadata/wavpack.c | |||
diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make new file mode 100644 index 0000000000..afa289ba28 --- /dev/null +++ b/lib/rbcodec/rbcodec.make | |||
@@ -0,0 +1,19 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | |||
8 | RBCODEC_LIB = $(RBCODEC_BLD)/librbcodec.a | ||
9 | RBCODEC_SRC := $(call preprocess, $(RBCODEC_DIR)/SOURCES) | ||
10 | RBCODEC_OBJ := $(call c2obj, $(RBCODEC_SRC)) | ||
11 | INCLUDES += -I$(RBCODEC_DIR) -I$(RBCODEC_DIR)/dsp -I$(RBCODEC_DIR)/metadata | ||
12 | OTHER_SRC += $(RBCODEC_SRC) | ||
13 | |||
14 | $(RBCODEC_BLD)/%.o: $(RBCODEC_DIR)/%.c | ||
15 | $(SILENT)mkdir -p $(dir $@) | ||
16 | $(call PRINTS,CC $<)$(CC) $(CFLAGS) $(RBCODEC_CFLAGS) -c $< -o $@ | ||
17 | |||
18 | $(RBCODEC_LIB): $(RBCODEC_OBJ) | ||
19 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | ||
diff --git a/lib/rbcodec/test/SOURCES b/lib/rbcodec/test/SOURCES index 467115e0d6..4c0d906dc5 100644 --- a/lib/rbcodec/test/SOURCES +++ b/lib/rbcodec/test/SOURCES | |||
@@ -1,49 +1,8 @@ | |||
1 | warble.c | 1 | warble.c |
2 | ../../../apps/metadata.c | ||
3 | ../../../apps/replaygain.c | ||
4 | ../../../firmware/buflib.c | 2 | ../../../firmware/buflib.c |
5 | ../../../firmware/core_alloc.c | 3 | ../../../firmware/core_alloc.c |
6 | ../../../firmware/common/strlcpy.c | 4 | ../../../firmware/common/strlcpy.c |
7 | ../../../firmware/common/unicode.c | 5 | ../../../firmware/common/unicode.c |
8 | ../../../firmware/common/structec.c | 6 | ../../../firmware/common/structec.c |
9 | ../../../apps/mp3data.c | ||
10 | ../../../apps/fixedpoint.c | 7 | ../../../apps/fixedpoint.c |
11 | ../../../uisimulator/common/io.c | 8 | ../../../uisimulator/common/io.c |
12 | ../../../apps/compressor.c | ||
13 | ../../../apps/dsp.c | ||
14 | ../../../apps/eq.c | ||
15 | ../../../apps/tdspeed.c | ||
16 | ../../../apps/metadata/a52.c | ||
17 | ../../../apps/metadata/adx.c | ||
18 | ../../../apps/metadata/aiff.c | ||
19 | ../../../apps/metadata/ape.c | ||
20 | ../../../apps/metadata/asap.c | ||
21 | ../../../apps/metadata/asf.c | ||
22 | ../../../apps/metadata/au.c | ||
23 | ../../../apps/metadata/ay.c | ||
24 | ../../../apps/metadata/flac.c | ||
25 | ../../../apps/metadata/gbs.c | ||
26 | ../../../apps/metadata/hes.c | ||
27 | ../../../apps/metadata/id3tags.c | ||
28 | ../../../apps/metadata/kss.c | ||
29 | ../../../apps/metadata/metadata_common.c | ||
30 | ../../../apps/metadata/mod.c | ||
31 | ../../../apps/metadata/monkeys.c | ||
32 | ../../../apps/metadata/mp3.c | ||
33 | ../../../apps/metadata/mp4.c | ||
34 | ../../../apps/metadata/mpc.c | ||
35 | ../../../apps/metadata/nsf.c | ||
36 | ../../../apps/metadata/ogg.c | ||
37 | ../../../apps/metadata/oma.c | ||
38 | ../../../apps/metadata/rm.c | ||
39 | ../../../apps/metadata/sgc.c | ||
40 | ../../../apps/metadata/sid.c | ||
41 | ../../../apps/metadata/smaf.c | ||
42 | ../../../apps/metadata/spc.c | ||
43 | ../../../apps/metadata/tta.c | ||
44 | ../../../apps/metadata/vgm.c | ||
45 | ../../../apps/metadata/vorbis.c | ||
46 | ../../../apps/metadata/vox.c | ||
47 | ../../../apps/metadata/wave.c | ||
48 | ../../../apps/metadata/wavpack.c | ||
49 | |||
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make index 0b70e9a932..11f7ab03ec 100644 --- a/lib/rbcodec/test/warble.make +++ b/lib/rbcodec/test/warble.make | |||
@@ -9,12 +9,15 @@ | |||
9 | 9 | ||
10 | 10 | ||
11 | 11 | ||
12 | RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec | ||
13 | RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec | ||
14 | |||
12 | FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall | 15 | FLAGS=-g -D__PCTOOL__ $(TARGET) -Wall |
13 | 16 | ||
14 | SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES) | 17 | SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES) |
15 | 18 | ||
16 | INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/codecs -I$(ROOTDIR)/apps/codecs/lib \ | 19 | INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/codecs -I$(ROOTDIR)/apps/codecs/lib \ |
17 | -I$(ROOTDIR)/apps/gui -I$(ROOTDIR)/apps/metadata | 20 | -I$(ROOTDIR)/apps/gui |
18 | INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \ | 21 | INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \ |
19 | -I$(ROOTDIR)/firmware/target/hosted \ | 22 | -I$(ROOTDIR)/firmware/target/hosted \ |
20 | -I$(ROOTDIR)/firmware/target/hosted/sdl | 23 | -I$(ROOTDIR)/firmware/target/hosted/sdl |
@@ -30,9 +33,10 @@ endif | |||
30 | 33 | ||
31 | include $(ROOTDIR)/tools/functions.make | 34 | include $(ROOTDIR)/tools/functions.make |
32 | include $(ROOTDIR)/apps/codecs/codecs.make | 35 | include $(ROOTDIR)/apps/codecs/codecs.make |
36 | include $(ROOTDIR)/lib/rbcodec/rbcodec.make | ||
33 | 37 | ||
34 | $(BUILDDIR)/$(BINARY): $(CODECS) | 38 | $(BUILDDIR)/$(BINARY): $(CODECS) |
35 | 39 | ||
36 | $(BUILDDIR)/$(BINARY): $$(OBJ) | 40 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(RBCODEC_LIB) |
37 | @echo LD $(BINARY) | 41 | @echo LD $(BINARY) |
38 | $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+ | 42 | $(SILENT)$(HOSTCC) $(SIMFLAGS) $(LIBS) -o $@ $+ |
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index b4a152c546..2aa990ac7d 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -444,7 +444,7 @@ sub buildzip { | |||
444 | if($swcodec) { | 444 | if($swcodec) { |
445 | glob_mkdir("$temp_dir/eqs"); | 445 | glob_mkdir("$temp_dir/eqs"); |
446 | 446 | ||
447 | glob_copy("$ROOT/apps/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets | 447 | glob_copy("$ROOT/lib/rbcodec/dsp/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets |
448 | } | 448 | } |
449 | 449 | ||
450 | glob_mkdir("$temp_dir/wps"); | 450 | glob_mkdir("$temp_dir/wps"); |
diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 65d6ca6aba..9c60fb1e7d 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES | |||
@@ -1,11 +1,6 @@ | |||
1 | database.c | 1 | database.c |
2 | ../../apps/fixedpoint.c | 2 | ../../apps/fixedpoint.c |
3 | ../../apps/metadata.c | ||
4 | #if CONFIG_CODEC == SWCODEC | ||
5 | ../../apps/replaygain.c | ||
6 | #endif | ||
7 | ../../apps/misc.c | 3 | ../../apps/misc.c |
8 | ../../apps/mp3data.c | ||
9 | ../../apps/tagcache.c | 4 | ../../apps/tagcache.c |
10 | ../../firmware/common/crc32.c | 5 | ../../firmware/common/crc32.c |
11 | ../../firmware/common/filefuncs.c | 6 | ../../firmware/common/filefuncs.c |
@@ -17,7 +12,9 @@ database.c | |||
17 | ../../firmware/logf.c | 12 | ../../firmware/logf.c |
18 | ../../uisimulator/common/io.c | 13 | ../../uisimulator/common/io.c |
19 | #if CONFIG_CODEC != SWCODEC | 14 | #if CONFIG_CODEC != SWCODEC |
20 | ../../apps/metadata/id3tags.c | 15 | ../../lib/rbcodec/metadata/id3tags.c |
21 | ../../apps/metadata/mp3.c | 16 | ../../lib/rbcodec/metadata/metadata.c |
17 | ../../lib/rbcodec/metadata/mp3.c | ||
18 | ../../lib/rbcodec/metadata/mp3data.c | ||
22 | #endif | 19 | #endif |
23 | /* Caution. metadata files do not add!! */ | 20 | /* Caution. metadata files do not add!! */ |
diff --git a/tools/database/database.make b/tools/database/database.make index 7d02a461bd..c7292a66a9 100644 --- a/tools/database/database.make +++ b/tools/database/database.make | |||
@@ -15,7 +15,7 @@ createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3) | |||
15 | echo "\#endif" >> $(3); \ | 15 | echo "\#endif" >> $(3); \ |
16 | echo $(3)) | 16 | echo $(3)) |
17 | 17 | ||
18 | METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/apps/metadata/*.c)) | 18 | METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)) |
19 | 19 | ||
20 | SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ | 20 | SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ |
21 | $(METADATAS), \ | 21 | $(METADATAS), \ |
@@ -28,6 +28,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ | |||
28 | -I$(ROOTDIR)/firmware/include \ | 28 | -I$(ROOTDIR)/firmware/include \ |
29 | -I$(ROOTDIR)/apps \ | 29 | -I$(ROOTDIR)/apps \ |
30 | -I$(ROOTDIR)/apps/recorder \ | 30 | -I$(ROOTDIR)/apps/recorder \ |
31 | -I$(ROOTDIR)/lib/rbcodec \ | ||
32 | -I$(ROOTDIR)/lib/rbcodec/metadata \ | ||
31 | -I$(APPSDIR) \ | 33 | -I$(APPSDIR) \ |
32 | -I$(BUILDDIR) \ | 34 | -I$(BUILDDIR) \ |
33 | 35 | ||
diff --git a/tools/root.make b/tools/root.make index 3231b73053..1bac0d6600 100644 --- a/tools/root.make +++ b/tools/root.make | |||
@@ -95,7 +95,10 @@ else ifneq (,$(findstring database,$(APP_TYPE))) | |||
95 | else ifneq (,$(findstring warble,$(APP_TYPE))) | 95 | else ifneq (,$(findstring warble,$(APP_TYPE))) |
96 | include $(ROOTDIR)/lib/rbcodec/test/warble.make | 96 | include $(ROOTDIR)/lib/rbcodec/test/warble.make |
97 | else | 97 | else |
98 | RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec | ||
99 | RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec | ||
98 | include $(APPSDIR)/apps.make | 100 | include $(APPSDIR)/apps.make |
101 | include $(RBCODEC_DIR)/rbcodec.make | ||
99 | include $(APPSDIR)/lang/lang.make | 102 | include $(APPSDIR)/lang/lang.make |
100 | 103 | ||
101 | ifdef SOFTWARECODECS | 104 | ifdef SOFTWARECODECS |
@@ -205,17 +208,19 @@ $(LINKROM): $(ROMLDS) | |||
205 | $(call PRINTS,PP $(@F)) | 208 | $(call PRINTS,PP $(@F)) |
206 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) | 209 | $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) |
207 | 210 | ||
208 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) | 211 | $(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) |
209 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 212 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
210 | -L$(BUILDDIR)/firmware -lfirmware \ | 213 | -L$(BUILDDIR)/firmware -lfirmware \ |
214 | -L$(RBCODEC_BLD) -lrbcodec \ | ||
211 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ | 215 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ |
212 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ | 216 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ |
213 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(BOOTBOXLDOPTS) \ | 217 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(BOOTBOXLDOPTS) \ |
214 | $(GLOBAL_LDOPTS) -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map | 218 | $(GLOBAL_LDOPTS) -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map |
215 | 219 | ||
216 | $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) | 220 | $(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) |
217 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ | 221 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ |
218 | -L$(BUILDDIR)/firmware -lfirmware \ | 222 | -L$(BUILDDIR)/firmware -lfirmware \ |
223 | -L$(RBCODEC_BLD) -lrbcodec \ | ||
219 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ | 224 | -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ |
220 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ | 225 | $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ |
221 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(GLOBAL_LDOPTS) \ | 226 | $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(GLOBAL_LDOPTS) \ |
diff --git a/uisimulator/uisimulator.make b/uisimulator/uisimulator.make index fc58f3a6c1..be57e3c216 100644 --- a/uisimulator/uisimulator.make +++ b/uisimulator/uisimulator.make | |||
@@ -30,7 +30,7 @@ $(SIMLIB): $$(SIMOBJ) $(UIBMP) | |||
30 | $(SILENT)$(shell rm -f $@) | 30 | $(SILENT)$(shell rm -f $@) |
31 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null | 31 | $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null |
32 | 32 | ||
33 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(SKINLIB) $(UNWARMINDER) | 33 | $(BUILDDIR)/$(BINARY): $$(OBJ) $(SIMLIB) $(VOICESPEEXLIB) $(FIRMLIB) $(RBCODEC_LIB) $(SKINLIB) $(UNWARMINDER) |
34 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \ | 34 | $(call PRINTS,LD $(BINARY))$(CC) -o $@ $^ $(SIMLIB) $(LDOPTS) $(GLOBAL_LDOPTS) \ |
35 | -Wl,-Map,$(BUILDDIR)/rockbox.map | 35 | -Wl,-Map,$(BUILDDIR)/rockbox.map |
36 | 36 | ||