libdts support by (Benjamin Zores <ben at geexbox dot org>)

[ffmpeg] / libavcodec / Makefile

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6271aa3ca98eec1595ff35c37266430bb18c4b39..cee949ed28b12588b0e9e181bd4c9e810d7822af 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -11,7 +11,7 @@ CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_S
 
 OBJS= common.o utils.o mem.o allcodecs.o \
       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
-      mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
+      mpegaudio.o ac3enc.o mjpeg.o resample.o resample2.o dsputil.o \
       motion_est.o imgconvert.o imgresample.o \
       mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
       ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
@@ -19,7 +19,8 @@ OBJS= common.o utils.o mem.o allcodecs.o \
       vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o cljr.o \
       roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \
       msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \
-      smc.o parser.o
+      smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \
+      flac.o vp3dsp.o integer.o
 
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)
@@ -33,6 +34,14 @@ CLEANAMR=cleanamrfloat
 endif
 endif
 
+ifeq ($(HAVE_PTHREADS),yes)
+OBJS+= pthread.o
+endif
+
+ifeq ($(HAVE_W32THREADS),yes)
+OBJS+= w32thread.o
+endif
+
 ifeq ($(AMR_WB),yes)
 OBJS+= amr.o amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
                amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
@@ -46,7 +55,7 @@ ASM_OBJS=
 
 # codecs which are patented in some non free countries like the us
 ifeq ($(CONFIG_RISKY),yes)
-OBJS+= h263.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
+OBJS+= h263.o h261.o msmpeg4.o h263dec.o svq1.o rv10.o wmadec.o indeo3.o
 endif
 
 ifeq ($(HAVE_XVMC_ACCEL),yes)
@@ -64,6 +73,11 @@ OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
 endif
 endif
 
+# currently using libdts for dts decoding
+ifeq ($(CONFIG_DTS),yes)
+OBJS+= dtsdec.o
+endif
+
 ifeq ($(CONFIG_FAAD),yes)
 OBJS+= faad.o
 ifeq ($(CONFIG_FAADBIN),yes)
@@ -107,9 +121,11 @@ ifeq ($(TARGET_MMX),yes)
 OBJS += i386/fdct_mmx.o i386/cputest.o \
        i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
        i386/idct_mmx.o i386/motion_est_mmx.o \
-       i386/simple_idct_mmx.o i386/fft_sse.o
+       i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
+       i386/vp3dsp_sse2.o
 ifdef TARGET_BUILTIN_VECTOR
 i386/fft_sse.o: CFLAGS+= -msse
+depend: CFLAGS+= -msse
 endif
 endif
 
@@ -151,6 +167,14 @@ ifeq ($(TARGET_ARCH_SH4),yes)
 OBJS+= sh4/idct_sh4.o sh4/dsputil_sh4.o sh4/dsputil_align.o
 endif
 
+ifeq ($(TARGET_ARCH_SPARC),yes)
+OBJS+=sparc/dsputil_vis.o
+sparc/%.o: sparc/%.c
+       $(CC) -mcpu=ultrasparc -mtune=ultrasparc $(CFLAGS) -c -o $@ $< 
+endif
+ifeq ($(TARGET_ARCH_SPARC64),yes)
+CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc
+endif
 
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)
 OBJS := $(OBJS) $(ASM_OBJS)
@@ -178,7 +202,7 @@ ifeq ($(CONFIG_WIN32),yes)
        $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
        -lib /machine:i386 /def:$(@:.dll=.def)
 else
-       $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+       $(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
 endif
 
 dsputil.o: dsputil.c dsputil.h
@@ -205,6 +229,7 @@ clean: $(CLEANAMR)
           ppc/*.o ppc/*~ \
           ps2/*.o ps2/*~ \
           sh4/*.o sh4/*~ \
+          sparc/*.o sparc/*~ \
           liba52/*.o liba52/*~ \
           apiexample $(TESTS)
        $(MAKE) -C libpostproc clean