3 files changed, 8 insertions, 16 deletions
diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index 307feefe56..f8eb6aa1be 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -5,17 +5,15 @@ LIBNAME_COMMON = mp3lib.a
 SRCS_COMMON = sr1.c
 SRCS_COMMON-$(HAVE_MMX)       += decode_mmx.c
 SRCS_COMMON-$(HAVE_SSE)       += dct64_sse.c
-ifeq ($(ARCH_X86_32),yes)
-SRCS_COMMON                   += decode_i586.c
-SRCS_COMMON-$(HAVE_MMX)       += dct64_mmx.c
-SRCS_COMMON-$(HAVE_3DNOW)     += dct36_3dnow.c dct64_3dnow.c
-SRCS_COMMON-$(HAVE_3DNOWEX)   += dct36_k7.c dct64_k7.c
-endif
+SRCS_COMMON-$(ARCH_X86_32)    += decode_i586.c
+SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_MMX)       += dct64_mmx.c
+SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW)     += dct36_3dnow.c dct64_3dnow.c
+SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX)   += dct36_k7.c dct64_k7.c
 SRCS_COMMON-$(HAVE_ALTIVEC)   += dct64_altivec.c
 
 include ../mpcommon.mak
 
 decode_i586.o: CFLAGS += -fomit-frame-pointer
 
-%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../osdep/getch2.o
+%: %.c $(LIBNAME_COMMON) ../libvo/aclib.o ../mp_msg-mencoder.o ../cpudetect.o ../mp_fifo.o ../osdep/$(TIMER) ../osdep/$(GETCH)
 	$(CC) $(CFLAGS) -o $@ $^ -ltermcap -lm
diff --git a/mp3lib/test.c b/mp3lib/test.c
index f256224a7d..8ce1143ff2 100644
--- a/mp3lib/test.c
+++ b/mp3lib/test.c
@@ -1,8 +1,6 @@
 
 #define DUMP_PCM
 
-// gcc test.c -I.. -L. -lMP3 -lm -o test1 -O4
-
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -12,7 +10,6 @@
 #include "config.h"
 #include "mp3lib/mp3.h"
 #include "cpudetect.h"
-extern CpuCaps gCpuCaps;
 
 static inline unsigned int GetTimer(){
   struct timeval tv;
@@ -71,5 +68,5 @@ int main(int argc,char* argv[]){
   printf("CPU usage at normal playback: %5.2f %%\n",time1*0.0001f/length);
   
   fclose(mp3file);
-  
+  return 0;
 }
diff --git a/mp3lib/test2.c b/mp3lib/test2.c
index 6a20960663..3c78596d81 100644
--- a/mp3lib/test2.c
+++ b/mp3lib/test2.c
@@ -1,8 +1,6 @@
-
-//gcc test2.c -O2 -I.. -L. ../libvo/aclib.c -lMP3 -lm -o test2
-
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
@@ -26,7 +24,6 @@ static unsigned char buffer[BUFFLEN];
 int main(int argc,char* argv[]){
   int len;
   int total=0;
-  float length;
   int r;
   int audio_fd;
   
@@ -68,5 +65,5 @@ int main(int argc,char* argv[]){
   }
   
   fclose(mp3file);
-  
+  return 0;
 }