diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2007-11-14 10:31:57 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2007-11-14 10:31:57 +0000 |
| commit | d3027d424b5f58f258c3bf0dbf62e0a3e4c252d0 (patch) | |
| tree | c1b2408b4ad2a23d9f1bebe20ab9d7709bbc90c5 /apps | |
| parent | 166aaf7b74f4e3bf3fe2bd2ee668fa5be5392391 (diff) | |
| download | rockbox-d3027d424b5f58f258c3bf0dbf62e0a3e4c252d0.zip rockbox-d3027d424b5f58f258c3bf0dbf62e0a3e4c252d0.tar.gz rockbox-d3027d424b5f58f258c3bf0dbf62e0a3e4c252d0.tar.bz2 rockbox-d3027d424b5f58f258c3bf0dbf62e0a3e4c252d0.tar.xz | |
Build libspeex for core voice on SWCODEC. Development phase - not currently utilized.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 22 | ||||
| -rw-r--r-- | apps/codecs/libspeex/sb_celp.c | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/apps/Makefile b/apps/Makefile index 1708727..649dd48 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -20,6 +20,12 @@ endif ifdef SOFTWARECODECS CODECS=build-codecs + +# This sets up the parameters for building and linking libspeex for core voice +VOICE=libspeex-rockbox +VOICELIB=$(BUILDDIR)/libspeex-rockbox.a +LINKVOICE= -lspeex-rockbox + endif # Set up the bitmap libraries @@ -92,6 +98,10 @@ dep: $(DEPFILE) features: $(OBJDIR)/features +libspeex-rockbox: + $(SILENT)mkdir -p $(OBJDIR)/libspeex-rockbox + $(call PRINTS,MAKE in libspeex for rockbox core)$(MAKE) -C $(APPSDIR)/codecs/libspeex ROCKBOX_VOICE_CODEC=1 OBJDIR=$(OBJDIR)/libspeex-rockbox OUTPUT=$(BUILDDIR)/libspeex-rockbox.a + build-codecs: $(SILENT)$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib $(SILENT)$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs @@ -126,13 +136,13 @@ $(MAXOUTFILE): $(SILENT)cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) $(SILENT)rm $(MAXINFILE) -$(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map +$(OBJDIR)/rombox.elf : $(OBJS) $(LINKROM) $(DEPFILE) $(LIBROCKBOX) $(VOICE) $(BITMAPLIBS) + $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lgcc $(LINKVOICE) $(LINKBITMAPS) -L$(BUILDDIR)/firmware -T$(LINKROM) -Wl,-Map,$(OBJDIR)/rombox.map ifndef SIMVER -$(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIBS) - $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map +$(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(VOICE) $(BITMAPLIBS) + $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKVOICE) $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ @@ -177,8 +187,8 @@ else endif $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ - $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) $(BITMAPLIBS) - $(call PRINTS,LD $(BINARY))$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) $(SIMULATOR_MAP) + $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) $(VOICE) $(BITMAPLIBS) + $(call PRINTS,LD $(BINARY))$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKVOICE) $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) $(SIMULATOR_MAP) endif $(BUILDDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin diff --git a/apps/codecs/libspeex/sb_celp.c b/apps/codecs/libspeex/sb_celp.c index 192c873..b12ca71 100644 --- a/apps/codecs/libspeex/sb_celp.c +++ b/apps/codecs/libspeex/sb_celp.c @@ -750,7 +750,7 @@ int sb_encode(void *state, void *vin, SpeexBits *bits) static SBDecState global_decstate_wb IBSS_ATTR; /* Do not include this for voice codec, files will never be UWB */ -#ifndef SPEEX_ROCKBOX_VOICE_CODEC +#ifndef ROCKBOX_VOICE_CODEC static SBDecState global_decstate_uwb IBSS_ATTR; #endif |