Mercurial > libavcodec.hg

comparison Makefile @ 9710:679b42929a09 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The MLP optimizations do not depend on HAVE_MMX, but on ARCH_X86. Build them when ARCH_X86 is enabled. Fixes linking with MMX disabled.
author diego
date Mon, 25 May 2009 19:02:35 +0000
parents 2ba472cabcca
children d563821462b4
comparison
equal deleted inserted replaced
9709:2ba472cabcca 9710:679b42929a09
432 OBJS-$(HAVE_OS2THREADS) += os2thread.o 432 OBJS-$(HAVE_OS2THREADS) += os2thread.o
433 OBJS-$(HAVE_PTHREADS) += pthread.o 433 OBJS-$(HAVE_PTHREADS) += pthread.o
434 OBJS-$(HAVE_W32THREADS) += w32thread.o 434 OBJS-$(HAVE_W32THREADS) += w32thread.o
435 435
436 # processor-specific code 436 # processor-specific code
437 X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
438 X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
439
440 OBJS-$(ARCH_X86) += $(X86-OBJS-yes)
441
437 YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o 442 YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o
438 YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o 443 YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o
439 YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o 444 YASM-OBJS-FFT-$(HAVE_SSE) += x86/fft_sse.o
440 YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o $(YASM-OBJS-FFT-yes) 445 YASM-OBJS-$(CONFIG_FFT) += x86/fft_mmx.o $(YASM-OBJS-FFT-yes)
441 YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \ 446 YASM-OBJS-$(CONFIG_GPL) += x86/h264_deblock_sse2.o \
443 448
444 MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o 449 MMX-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp_mmx.o
445 MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o 450 MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o
446 MMX-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_mmx.o 451 MMX-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_mmx.o
447 MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o 452 MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o
448 MMX-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
449 MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp_mmx.o 453 MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp_mmx.o
450 MMX-OBJS-$(CONFIG_THEORA_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o 454 MMX-OBJS-$(CONFIG_THEORA_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
451 MMX-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
452 MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o 455 MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o
453 MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o 456 MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
454 MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o 457 MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o
455 MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \ 458 MMX-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o \
456 x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o 459 x86/vp6dsp_mmx.o x86/vp6dsp_sse2.o