[MPlayer-cvslog] r21065 - in trunk/mp3lib: Makefile decod386.c sr1.c

[reimar]

Author: reimar
Date: Sun Nov 19 17:54:06 2006
New Revision: 21065

Modified:
   trunk/mp3lib/Makefile
   trunk/mp3lib/decod386.c
   trunk/mp3lib/sr1.c

Log:
Remove (now hopefully unnecessary) workarounds added in r21056


Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile	(original)
+++ trunk/mp3lib/Makefile	Sun Nov 19 17:54:06 2006
@@ -9,17 +9,9 @@
 SRCS = sr1.c
 ifeq ($(TARGET_ARCH_X86_32),yes)
 SRCS += decode_i586.c
-# Darwin can't compile tabinit_MMX.c. However, we need costab_mmx from
-# decode_mmx.c for dct64_sse.c.
-ifeq ($(TARGET_OS),Darwin)
-ifeq ($(TARGET_MMX),yes)
-SRCS += decode_MMX.c
-endif
-else
 ifeq ($(TARGET_MMX),yes)
 SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c
 endif
-endif
 ifeq ($(TARGET_3DNOW),yes)
 SRCS += dct36_3dnow.c dct64_3dnow.c
 endif

Modified: trunk/mp3lib/decod386.c
==============================================================================
--- trunk/mp3lib/decod386.c	(original)
+++ trunk/mp3lib/decod386.c	Sun Nov 19 17:54:06 2006
@@ -19,11 +19,6 @@
 
 #include "config.h"
 
-/* Can't compile MMX assembly on Darwin */
-#ifdef SYS_DARWIN
-#undef HAVE_MMX
-#endif /* SYS_DARWIN */
-
 #if 0
  /* old WRITE_SAMPLE */
    /* is portable */

Modified: trunk/mp3lib/sr1.c
==============================================================================
--- trunk/mp3lib/sr1.c	(original)
+++ trunk/mp3lib/sr1.c	Sun Nov 19 17:54:06 2006
@@ -31,11 +31,6 @@
 
 #include "libvo/fastmemcpy.h"
 
-// Can't compile MMX assembly on Darwin
-#ifdef SYS_DARWIN
-#undef HAVE_MMX
-#endif /* SYS_DARWIN */
-
 #ifdef ARCH_X86_32
 #define CAN_COMPILE_X86_ASM
 #endif