diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-02-18 00:11:49 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-02-18 00:11:49 +0000 |
| commit | ca14e2a8b7d47fbfe99df092add587c1fce56895 (patch) | |
| tree | f2be6026b095e4a34ef2784dcf7557bb67498747 /libavcodec/Makefile | |
| parent | a1ef9f08ecc699c1feca71883ca48ecfc57b45b7 (diff) | |
| download | ffmpeg-ca14e2a8b7d47fbfe99df092add587c1fce56895.tar.gz | |
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.
Originally committed as revision 17409 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9dd0d6a183..0f6e81322f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -402,6 +402,12 @@ OBJS-$(HAVE_PTHREADS) += pthread.o 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 @@ OBJS-$(HAVE_MMX) += x86/cpuid.o \ 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 \ |