Mercurial > mplayer.hg

changeset 21049:0db8fb3cc48d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove (now hopefully unnecessary) workarounds added in r21056
author reimar
date Sun, 19 Nov 2006 16:54:06 +0000
parents 8cecfb2b4361
children b073c5879396
files mp3lib/Makefile mp3lib/decod386.c mp3lib/sr1.c
diffstat 3 files changed, 0 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/mp3lib/Makefile	Sun Nov 19 16:49:41 2006 +0000
+++ b/mp3lib/Makefile	Sun Nov 19 16:54:06 2006 +0000
@@ -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
--- a/mp3lib/decod386.c	Sun Nov 19 16:49:41 2006 +0000
+++ b/mp3lib/decod386.c	Sun Nov 19 16:54:06 2006 +0000
@@ -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 */
--- a/mp3lib/sr1.c	Sun Nov 19 16:49:41 2006 +0000
+++ b/mp3lib/sr1.c	Sun Nov 19 16:54:06 2006 +0000
@@ -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