From 4b4ab6fb85db8f0e0cc5548727069c02290f42c9 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 19 Nov 2006 16:54:06 +0000
Subject: Remove (now hopefully unnecessary) workarounds added in r21056

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21065 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mp3lib/Makefile   | 8 --------
 mp3lib/decod386.c | 5 -----
 mp3lib/sr1.c      | 5 -----
 3 files changed, 18 deletions(-)

(limited to 'mp3lib')

diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index b25fbdbf75..2889e9c72f 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -9,17 +9,9 @@ CFLAGS  = -I.. $(OPTFLAGS)
 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
diff --git a/mp3lib/decod386.c b/mp3lib/decod386.c
index bd93932353..6752146755 100644
--- a/mp3lib/decod386.c
+++ b/mp3lib/decod386.c
@@ -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 */
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 3847e8e6b5..e5e6395290 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -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
-- 
cgit v1.2.3