# HG changeset patch # User diego # Date 1234915909 0 # Node ID d08dc32559e71791b76c24e533a63e8c4c0c339e # Parent 14c71c1f46b01d0c0ca15f97f3ec3098ce9e4efa 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. diff -r 14c71c1f46b0 -r d08dc32559e7 Makefile --- 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 \