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.zip rockbox-b5716df4cb2837bbbc42195cf1aefcf03e21d6a6.tar.gz rockbox-b5716df4cb2837bbbc42195cf1aefcf03e21d6a6.tar.bz2 rockbox-b5716df4cb2837bbbc42195cf1aefcf03e21d6a6.tar.xz | |
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 b4a152c..2aa990a 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl @@ -444,7 +444,7 @@ sub buildzip { if($swcodec) { glob_mkdir("$temp_dir/eqs"); - glob_copy("$ROOT/apps/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets + glob_copy("$ROOT/lib/rbcodec/dsp/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets } glob_mkdir("$temp_dir/wps"); diff --git a/tools/database/SOURCES b/tools/database/SOURCES index 65d6ca6..9c60fb1 100644 --- a/tools/database/SOURCES +++ b/tools/database/SOURCES @@ -1,11 +1,6 @@ database.c ../../apps/fixedpoint.c -../../apps/metadata.c -#if CONFIG_CODEC == SWCODEC -../../apps/replaygain.c -#endif ../../apps/misc.c -../../apps/mp3data.c ../../apps/tagcache.c ../../firmware/common/crc32.c ../../firmware/common/filefuncs.c @@ -17,7 +12,9 @@ database.c ../../firmware/logf.c ../../uisimulator/common/io.c #if CONFIG_CODEC != SWCODEC -../../apps/metadata/id3tags.c -../../apps/metadata/mp3.c +../../lib/rbcodec/metadata/id3tags.c +../../lib/rbcodec/metadata/metadata.c +../../lib/rbcodec/metadata/mp3.c +../../lib/rbcodec/metadata/mp3data.c #endif /* Caution. metadata files do not add!! */ diff --git a/tools/database/database.make b/tools/database/database.make index 7d02a46..c7292a6 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) echo "\#endif" >> $(3); \ echo $(3)) -METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/apps/metadata/*.c)) +METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c)) SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \ $(METADATAS), \ @@ -28,6 +28,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \ -I$(ROOTDIR)/firmware/include \ -I$(ROOTDIR)/apps \ -I$(ROOTDIR)/apps/recorder \ + -I$(ROOTDIR)/lib/rbcodec \ + -I$(ROOTDIR)/lib/rbcodec/metadata \ -I$(APPSDIR) \ -I$(BUILDDIR) \ diff --git a/tools/root.make b/tools/root.make index 3231b73..1bac0d6 100644 --- a/tools/root.make +++ b/tools/root.make @@ -95,7 +95,10 @@ else ifneq (,$(findstring database,$(APP_TYPE))) else ifneq (,$(findstring warble,$(APP_TYPE))) include $(ROOTDIR)/lib/rbcodec/test/warble.make else + RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec + RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec include $(APPSDIR)/apps.make + include $(RBCODEC_DIR)/rbcodec.make include $(APPSDIR)/lang/lang.make ifdef SOFTWARECODECS @@ -205,17 +208,19 @@ $(LINKROM): $(ROMLDS) $(call PRINTS,PP $(@F)) $(call preprocess2file,$<,$@,-DLOADADDRESS=$(LOADADDRESS)) -$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) +$(BUILDDIR)/rockbox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKRAM) $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ -L$(BUILDDIR)/firmware -lfirmware \ + -L$(RBCODEC_BLD) -lrbcodec \ -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(BOOTBOXLDOPTS) \ $(GLOBAL_LDOPTS) -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map -$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) +$(BUILDDIR)/rombox.elf : $$(OBJ) $$(FIRMLIB) $$(RBCODEC_LIB) $$(VOICESPEEXLIB) $$(SKINLIB) $$(LIBARMSUPPORT) $$(UNWARMINDER) $$(LINKROM) $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \ -L$(BUILDDIR)/firmware -lfirmware \ + -L$(RBCODEC_BLD) -lrbcodec \ -L$(BUILDDIR)/lib -lskin_parser $(LIBARMSUPPORT_LINK) \ $(UNWARMINDER_LINK) -L$(BUILDDIR)/apps/codecs \ $(VOICESPEEXLIB:lib%.a=-l%) -lgcc $(GLOBAL_LDOPTS) \ |