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 /tools | |
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
Diffstat (limited to 'tools')
-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 |
4 files changed, 15 insertions, 11 deletions
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) \ |