GMini: libmad compiled

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6173 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 19 insertions, 13 deletions

diff --git a/apps/Makefile b/apps/Makefile
index af73f90d3f..69b1fba577 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -69,7 +69,7 @@ $(OBJDIR)/librockbox.a:
 
 $(LINKFILE): $(LDS)
         @echo "Build LDS file"
-        @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
+        @cat $< | $(CC) -DLOADADDRESS=$(LOADADDRESS) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
 
 $(LINKROM): $(ROMLDS)
         @echo "Build LDS file for Rombox"
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index a5ac81b0cd..0fbcc2a7b7 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -17,7 +17,8 @@ ifdef APPEXTRA
 endif
 
 .PHONY: libmad liba52 libFLAC libTremor libwavpack
-OUTPUT = libmad liba52 libFLAC libTremor libwavpack
+
+OUTPUT = $(SOFTWARECODECS)
 
 all: $(OUTPUT)
 
diff --git a/apps/codecs/codec.h b/apps/codecs/codec.h
index 6bd1020e09..c00d2bda95 100644
--- a/apps/codecs/codec.h
+++ b/apps/codecs/codec.h
@@ -19,6 +19,8 @@
 
 /* Global declarations to be used in rockbox software codecs */
 
+#include "config.h"
+
 #include <sys/types.h>
 
 /* Get these functions 'out of the way' of the standard functions. Not doing
diff --git a/apps/codecs/libmad/Makefile b/apps/codecs/libmad/Makefile
index cef3adae11..68d6274f9b 100644
--- a/apps/codecs/libmad/Makefile
+++ b/apps/codecs/libmad/Makefile
@@ -31,11 +31,11 @@ all: $(OUTPUT)
 
 $(OUTPUT): $(OBJS)
         @echo "AR $@"
-        @$(AR) ruv $@ $+ >/dev/null 2>&1
+        $(AR) ruv $@ $+ >/dev/null 2>&1
 
 $(OBJDIR)/%.o: $(APPSDIR)/codecs/libmad/%.c
         @echo "CC $<"
-        @$(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@
+        $(CC) -c -O2 $(CFLAGS) -I$(APPSDIR)/codecs/libmad/ $< -o $@
 
 include $(TOOLSDIR)/make.inc
 
diff --git a/apps/codecs/libmad/layer12.c b/apps/codecs/libmad/layer12.c
index 3c5d0ce613..8d3b920ea6 100644
--- a/apps/codecs/libmad/layer12.c
+++ b/apps/codecs/libmad/layer12.c
@@ -485,7 +485,8 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
     for (sb = 0; sb < bound; ++sb) {
       for (ch = 0; ch < nch; ++ch) {
         if ((index = allocation[ch][sb])) {
-          index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+          int off = bitalloc_table[offsets[sb]].offset;
+          index = offset_table[off][index - 1];
 
           II_samples(&stream->ptr, &qc_table[index], samples);
 
@@ -503,7 +504,8 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
 
     for (sb = bound; sb < sblimit; ++sb) {
       if ((index = allocation[0][sb])) {
-        index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
+        int off = bitalloc_table[offsets[sb]].offset;
+        index = offset_table[off][index - 1];
 
         II_samples(&stream->ptr, &qc_table[index], samples);
 
diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c
index 27c8d18430..a8d2d5f7f9 100644
--- a/apps/codecs/libmad/layer3.c
+++ b/apps/codecs/libmad/layer3.c
@@ -853,7 +853,7 @@ void III_exponents(struct channel const *channel,
       exponents[sfbi + 2] = gain2 -
         (signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier);
 
-      l    += 3 * sfbwidth[sfbi];
+      l    += 3I * sfbwidth[sfbi];
       sfbi += 3;
     }
   }
@@ -1308,7 +1308,8 @@ void III_reorder(mad_fixed_t xr[576], struct channel const *channel,
       w = (w + 1) % 3;
     }
 
-    tmp[sbw[w]][w][sw[w]++] = xr[l];
+    unsigned int sbww = sbw[w];
+    tmp[sbww][w][sw[w]++] = xr[l];
 
     if (sw[w] == 6) {
       sw[w] = 0;
diff --git a/tools/configure b/tools/configure
index 3fe48081cd..f339c71974 100755
--- a/tools/configure
+++ b/tools/configure
@@ -342,7 +342,7 @@ if [ -z "$archos" ]; then
 
    5)
     archos="gmini120"
-    target="-DARCHOS_GMINI120 -DLOADADDRESS=\$(LOADADDRESS)"
+    target="-DARCHOS_GMINI120"
     memory=16 # fixed size (16 is a guess, remove comment when checked)
     calmrisccc
     tool="cp" # might work for now!
@@ -351,12 +351,12 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash=""
     plugins="" # disabled for now, enable later on
-    codecs=""
+    codecs="libmad"
     ;;
 
    6)
     archos="gminisp"
-    target="-DARCHOS_GMINISP -DLOADADDRESS=\$(LOADADDRESS)"
+    target="-DARCHOS_GMINISP"
     memory=16 # fixed size (16 is a guess, remove comment when checked)
     calmrisccc
     tool="cp" # might work for now!
@@ -365,7 +365,7 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash=""
     plugins="" # disabled for now, enable later on
-    codecs=""
+    codecs="libmad"
     ;;
 
    7)
@@ -405,7 +405,7 @@ if [ -z "$archos" ]; then
     archosrom=""
     flash=""
     plugins="yes"
-    codecs="yes"
+    codecs="libmad liba52 libFLAC libTremor libwavpack"
     ;;
 
    *)