From 7bf62e8da66ca8ff0acc2702f92ea4fe06eb94b1 Mon Sep 17 00:00:00 2001 From: Dan Everton Date: Sat, 10 Feb 2007 11:44:26 +0000 Subject: * Sync Speex codec with Speex SVN revision 12449 (roughly Speex 1.2beta1). * Redo the changes required to make Speex compile in Rockbox. Should be a bit easier to keep in sync with Speex SVN now. * Fix name of Speex library in codecs Makefile. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12254 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'apps/codecs/Makefile') diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 61c9476..e555d94 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile @@ -17,7 +17,7 @@ ifdef APPEXTRA endif ifdef SOFTWARECODECS - CODECLIBS = -lmad -la52 -lffmpegFLAC -lTremor -lwavpack -lmusepack -lalac -lfaad -lm4a -lspeex + CODECLIBS = -lmad -la52 -lffmpegFLAC -lTremor -lwavpack -lmusepack -lalac -lfaad -lm4a -lspeex endif # we "borrow" the plugin LDS file @@ -39,7 +39,7 @@ DIRS = . CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a -.PHONY: libmad liba52 libffmpegFLAC libTremor libspeex libwavpack libmusepack libalac libfaad libm4a +.PHONY: libmad liba52 libffmpegFLAC libTremor libspeex libwavpack libmusepack libalac libfaad libm4a OUTPUT = $(SOFTWARECODECS) @@ -164,9 +164,7 @@ $(BUILDDIR)/libspeex.a: libspeex libspeex: $(SILENT)mkdir -p $(OBJDIR)/libspeex - $(call PRINTS,MAKE in Tremor)$(MAKE) -C libspeex OBJDIR=$(OBJDIR)/libspeex OUTPUT=$(BUILDDIR)/libspeex.a - - + $(call PRINTS,MAKE in libspeex)$(MAKE) -C libspeex OBJDIR=$(OBJDIR)/libspeex OUTPUT=$(BUILDDIR)/libspeex.a $(BUILDDIR)/libwavpack.a: libwavpack -- cgit v1.1