comparison Makefile @ 8162:368413cfe34b libavcodec

Add a Makefile variable for the old scaler that gets enabled when the new scaler is disabled to get rid of a Makefile ifdef.
author diego
date Mon, 17 Nov 2008 22:51:59 +0000
parents bc4ddc399192
children abd16c8cf7bb
comparison
equal deleted inserted replaced
8161:bc4ddc399192 8162:368413cfe34b
25 25
26 OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o 26 OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o
27 OBJS-$(CONFIG_FFT) += fft.o 27 OBJS-$(CONFIG_FFT) += fft.o
28 OBJS-$(CONFIG_GOLOMB) += golomb.o 28 OBJS-$(CONFIG_GOLOMB) += golomb.o
29 OBJS-$(CONFIG_MDCT) += mdct.o 29 OBJS-$(CONFIG_MDCT) += mdct.o
30 OBJS-$(CONFIG_OLDSCALER) += imgresample.o
30 31
31 OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o 32 OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o
32 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o 33 OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o
33 OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o 34 OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o
34 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o 35 OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o
381 OBJS-$(HAVE_PTHREADS) += pthread.o 382 OBJS-$(HAVE_PTHREADS) += pthread.o
382 OBJS-$(HAVE_W32THREADS) += w32thread.o 383 OBJS-$(HAVE_W32THREADS) += w32thread.o
383 384
384 OBJS-$(HAVE_XVMC) += xvmcvideo.o 385 OBJS-$(HAVE_XVMC) += xvmcvideo.o
385 386
386 ifndef CONFIG_SWSCALE
387 OBJS += imgresample.o
388 endif
389
390 # processor-specific code 387 # processor-specific code
391 ifdef HAVE_MMX 388 ifdef HAVE_MMX
392 OBJS += i386/fdct_mmx.o \ 389 OBJS += i386/fdct_mmx.o \
393 i386/cpuid.o \ 390 i386/cpuid.o \
394 i386/dsputil_mmx.o \ 391 i386/dsputil_mmx.o \