Mercurial > libavcodec.hg
comparison Makefile @ 8188:ef38b923ca2c libavcodec
Get rid of last ifdef HAVE_MMX. Instead, all MMX-specific objects are gathered
into a separate variable which is added to OBJS if MMX is enabled.
| author | diego |
|---|---|
| date | Thu, 20 Nov 2008 23:04:04 +0000 |
| parents | ed46f99f2002 |
| children | 06acc3ab4bdc |
comparison
equal
deleted
inserted
replaced
| 8187:cf5183ff0417 | 8188:ef38b923ca2c |
|---|---|
| 387 OBJS-$(HAVE_W32THREADS) += w32thread.o | 387 OBJS-$(HAVE_W32THREADS) += w32thread.o |
| 388 | 388 |
| 389 OBJS-$(HAVE_XVMC) += xvmcvideo.o | 389 OBJS-$(HAVE_XVMC) += xvmcvideo.o |
| 390 | 390 |
| 391 # processor-specific code | 391 # processor-specific code |
| 392 MMX-OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o | |
| 393 MMX-OBJS-$(CONFIG_ENCODERS) += i386/dsputilenc_mmx.o | |
| 394 MMX-OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o | |
| 395 MMX-OBJS-$(CONFIG_GPL) += i386/idct_mmx.o | |
| 396 MMX-OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o | |
| 397 MMX-OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o | |
| 398 MMX-OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 399 MMX-OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 400 MMX-OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 401 MMX-OBJS-$(CONFIG_VP6A_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 402 MMX-OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 403 MMX-OBJS-$(CONFIG_WMV3_DECODER) += i386/vc1dsp_mmx.o | |
| 404 MMX-OBJS-$(HAVE_YASM) += i386/dsputil_yasm.o | |
| 405 | |
| 392 OBJS-$(HAVE_MMX) += i386/cpuid.o \ | 406 OBJS-$(HAVE_MMX) += i386/cpuid.o \ |
| 393 i386/dsputil_mmx.o \ | 407 i386/dsputil_mmx.o \ |
| 394 i386/fdct_mmx.o \ | 408 i386/fdct_mmx.o \ |
| 395 i386/idct_mmx_xvid.o \ | 409 i386/idct_mmx_xvid.o \ |
| 396 i386/idct_sse2_xvid.o \ | 410 i386/idct_sse2_xvid.o \ |
| 397 i386/motion_est_mmx.o \ | 411 i386/motion_est_mmx.o \ |
| 398 i386/mpegvideo_mmx.o \ | 412 i386/mpegvideo_mmx.o \ |
| 399 i386/simple_idct_mmx.o \ | 413 i386/simple_idct_mmx.o \ |
| 414 $(MMX-OBJS-yes) | |
| 400 | 415 |
| 401 OBJS-$(CONFIG_FFT_MMX) += i386/fft_3dn.o \ | 416 OBJS-$(CONFIG_FFT_MMX) += i386/fft_3dn.o \ |
| 402 i386/fft_3dn2.o \ | 417 i386/fft_3dn2.o \ |
| 403 i386/fft_mmx.o \ | 418 i386/fft_mmx.o \ |
| 404 i386/fft_sse.o \ | 419 i386/fft_sse.o \ |
| 405 | |
| 406 ifdef HAVE_MMX | |
| 407 OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o | |
| 408 OBJS-$(CONFIG_ENCODERS) += i386/dsputilenc_mmx.o | |
| 409 OBJS-$(CONFIG_FLAC_ENCODER) += i386/flacdsp_mmx.o | |
| 410 OBJS-$(CONFIG_GPL) += i386/idct_mmx.o | |
| 411 OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o | |
| 412 OBJS-$(CONFIG_VC1_DECODER) += i386/vc1dsp_mmx.o | |
| 413 OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 414 OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 415 OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 416 OBJS-$(CONFIG_VP6A_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 417 OBJS-$(CONFIG_VP6F_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o | |
| 418 OBJS-$(CONFIG_WMV3_DECODER) += i386/vc1dsp_mmx.o | |
| 419 OBJS-$(HAVE_YASM) += i386/dsputil_yasm.o | |
| 420 endif | |
| 421 | 420 |
| 422 OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ | 421 OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ |
| 423 alpha/dsputil_alpha_asm.o \ | 422 alpha/dsputil_alpha_asm.o \ |
| 424 alpha/motion_est_alpha.o \ | 423 alpha/motion_est_alpha.o \ |
| 425 alpha/motion_est_mvi_asm.o \ | 424 alpha/motion_est_mvi_asm.o \ |
