diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2007-10-02 11:39:32 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2007-10-02 11:39:32 +0000 |
| commit | 89523beea45e265d985aace8be79b45e94f21e6b (patch) | |
| tree | 22e94bf7a6cef3a705148ebfdb3b0621a82e0904 /libavcodec/Makefile | |
| parent | 298726ba556587db5fc108870300297352bbe69f (diff) | |
| download | ffmpeg-89523beea45e265d985aace8be79b45e94f21e6b.tar.gz | |
Sanitize altivec code so it can be built with runtime check properly
Originally committed as revision 10640 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a41dd8f53c..e5d6b13b2d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -403,7 +403,7 @@ OBJS-$(ARCH_SH4) += sh4/idct_sh4.o \ sh4/dsputil_align.o \ sh4/dsputil_sh4.o \ -OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \ +ALTIVEC-OBJS-yes += ppc/dsputil_altivec.o \ ppc/fdct_altivec.o \ ppc/fft_altivec.o \ ppc/float_altivec.o \ @@ -413,12 +413,17 @@ OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \ ppc/mpegvideo_altivec.o \ ppc/mpegvideo_ppc.o \ -ifeq ($(HAVE_ALTIVEC),yes) -OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o -OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.o -OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o -OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o -endif +ALTIVEC-OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o +ALTIVEC-OBJS-$(CONFIG_SNOW_DECODER) += ppc/snow_altivec.o +ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o +ALTIVEC-OBJS-$(CONFIG_WMV3_DECODER) += ppc/vc1dsp_altivec.o + +# -maltivec is needed in order to build AltiVec code. +$(ALTIVEC-OBJS-yes): CFLAGS += -maltivec -mabi=altivec + +# check_altivec must be built without -maltivec +OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS-yes) \ + ppc/check_altivec.o OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ bfin/mpegvideo_bfin.o \ |