From a2d82df9ccfc0ca12129637aeb9869489ef57a4a Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 24 Apr 2008 16:41:44 +0000
Subject: Move libfaad2 fixed-point CFLAGS setting to configure.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26517 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure         | 8 ++++++--
 libfaad2/Makefile | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index a004903894..296f1b2be5 100755
--- a/configure
+++ b/configure
@@ -6180,7 +6180,12 @@ if test "$_faad_internal" = yes ; then
   _def_faad_internal="#define USE_FAAD_INTERNAL 1"
   _faad=yes
   _res_comment="internal floating-point"
-  test "$_faad_fixed" = yes && _res_comment="internal fixed-point"
+  if test "$_faad_fixed" = yes ; then
+    # The FIXED_POINT implementation of FAAD2 improves performance
+    # on some platforms, especially for SBR files.
+    CFLAGS="$CFLAGS -DFIXED_POINT"
+    _res_comment="internal fixed-point"
+  fi
 elif test "$_faad_external" = yes ; then
   _faad=yes
   _ld_extra="$_ld_extra -lfaad"
@@ -7805,7 +7810,6 @@ LIBMAD = $_mad
 LIBVORBIS = $_vorbis
 LIBTHEORA = $_theora
 FAAD_INTERNAL = $_faad_internal
-FAAD_FIXED = $_faad_fixed
 LIBSMBCLIENT = $_smbsupport
 XMMS_PLUGINS = $_xmms
 MACOSX_FINDER_SUPPORT = $_macosx_finder_support
diff --git a/libfaad2/Makefile b/libfaad2/Makefile
index 59b06515a0..81dd521295 100644
--- a/libfaad2/Makefile
+++ b/libfaad2/Makefile
@@ -43,8 +43,4 @@ SRCS_COMMON = bits.c \
 
 CFLAGS  = -D_GNU_SOURCE
 
-# The FIXED_POINT implementation of FAAD2 improves performance
-# on some platforms, especially for SBR files.
-CFLAGS-$(FAAD_FIXED)  += -DFIXED_POINT
-
 include ../mpcommon.mak
-- 
cgit v1.2.3