Add codecs to librbcodec.

Change-Id: Id7f4717d51ed02d67cb9f9cb3c0ada4a81843f97
Reviewed-on: http://gerrit.rockbox.org/137
Reviewed-by: Nils Wallménius <nils@rockbox.org>
Tested-by: Nils Wallménius <nils@rockbox.org>

1 files changed, 2 insertions, 7 deletions

diff --git a/tools/root.make b/tools/root.make
index 0fc6c55403..689047e9db 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -101,17 +101,12 @@ else ifneq (,$(findstring database,$(APP_TYPE)))
 else ifneq (,$(findstring warble,$(APP_TYPE)))
   include $(ROOTDIR)/lib/rbcodec/test/warble.make
   include $(ROOTDIR)/lib/tlsf/libtlsf.make
-  include $(APPSDIR)/codecs/codecs.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 else
   include $(APPSDIR)/apps.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
   include $(APPSDIR)/lang/lang.make
 
-  ifdef SOFTWARECODECS
-    include $(APPSDIR)/codecs/codecs.make
-  endif
-
   ifdef ENABLEDPLUGINS
     include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make
     include $(APPSDIR)/plugins/plugins.make
@@ -206,7 +201,7 @@ $(LINKROM): $(ROMLDS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
                 -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
                 -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
@@ -214,7 +209,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI
 $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
                 -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
                 -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map