[MPlayer-cvslog] r26517 - in trunk: configure libfaad2/Makefile

[diego]

Author: diego
Date: Thu Apr 24 18:41:44 2008
New Revision: 26517

Log:
Move libfaad2 fixed-point CFLAGS setting to configure.


Modified:
   trunk/configure
   trunk/libfaad2/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Apr 24 18:41:44 2008
@@ -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

Modified: trunk/libfaad2/Makefile
==============================================================================
--- trunk/libfaad2/Makefile	(original)
+++ trunk/libfaad2/Makefile	Thu Apr 24 18:41:44 2008
@@ -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