changeset 8964:d08dc32559e7 libavcodec

Handle conditional compilation of CPU-specific FFT code in the Makefile. Also replace one coarse MMX condition with more fine-grained 3DNow!/3DNowExt!/SSE conditions.
author diego
date Wed, 18 Feb 2009 00:11:49 +0000
parents 14c71c1f46b0
children a5dce344904a
files Makefile
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Feb 17 23:59:53 2009 +0000
+++ b/Makefile	Wed Feb 18 00:11:49 2009 +0000
@@ -402,6 +402,12 @@
 OBJS-$(HAVE_W32THREADS)                += w32thread.o
 
 # processor-specific code
+FFT-OBJS-$(HAVE_AMD3DNOW)              += x86/fft_3dn.o
+FFT-OBJS-$(HAVE_AMD3DNOWEXT)           += x86/fft_3dn2.o
+FFT-OBJS-$(HAVE_SSE)                   += x86/fft_sse.o
+OBJS-$(CONFIG_FFT)                     += $(FFT-OBJS-yes)
+
+YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o
 YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
                                           x86/h264_idct_sse2.o          \
 
@@ -435,11 +441,6 @@
                                           x86/simple_idct_mmx.o         \
                                           $(MMX-OBJS-yes)
 
-OBJS-$(CONFIG_FFT_MMX)                 += x86/fft_3dn.o                 \
-                                          x86/fft_3dn2.o                \
-                                          x86/fft_mmx.o                 \
-                                          x86/fft_sse.o                 \
-
 OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.o         \
                                           alpha/dsputil_alpha_asm.o     \
                                           alpha/motion_est_alpha.o      \