Unified · Split
| @@ -100,7 +100,8 @@ config.h: .config · 99 unmodified lines | ||
| 100 | 100 | |
| 101 | 101 | SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ |
| 102 | 102 | ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ |
| 103 | − ALTIVEC-OBJS ARMV6-OBJS MMX-OBJS NEON-OBJS YASM-OBJS \ | |
| 103 | + ALTIVEC-OBJS ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS MMI-OBJS \ | |
| 104 | + MMX-OBJS NEON-OBJS VIS-OBJS YASM-OBJS \ | |
| 104 | 105 | OBJS TESTOBJS |
| 105 | 106 | |
| 106 | 107 | define RESET |
| @@ -0,0 +1,13 @@ | ||
| 1 | +OBJS-$(HAVE_ARMV5TE) += $(ARMV5TE-OBJS) $(ARMV5TE-OBJS-yes) | |
| 2 | +OBJS-$(HAVE_ARMV6) += $(ARMV6-OBJS) $(ARMV6-OBJS-yes) | |
| 3 | +OBJS-$(HAVE_ARMVFP) += $(ARMVFP-OBJS) $(ARMVFP-OBJS-yes) | |
| 4 | +OBJS-$(HAVE_NEON) += $(NEON-OBJS) $(NEON-OBJS-yes) | |
| 5 | + | |
| 6 | +OBJS-$(HAVE_MMI) += $(MMI-OBJS) $(MMI-OBJS-yes) | |
| 7 | + | |
| 8 | +OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes) | |
| 9 | + | |
| 10 | +OBJS-$(HAVE_VIS) += $(VIS-OBJS) $(VIS-OBJS-yes) | |
| 11 | + | |
| 12 | +OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-OBJS-yes) | |
| 13 | +OBJS-$(HAVE_YASM) += $(YASM-OBJS) $(YASM-OBJS-yes) | |
| @@ -5,7 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | # first so "all" becomes default target |
| 6 | 6 | all: all-yes |
| 7 | 7 | |
| 8 | −OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes) | |
| 8 | +include $(SRC_PATH)/arch.mak | |
| 9 | 9 | |
| 10 | 10 | OBJS += $(OBJS-yes) |
| 11 | 11 | FFLIBS := $(FFLIBS-yes) $(FFLIBS) |
| @@ -27,21 +27,19 @@ OBJS += arm/dsputil_init_arm.o \ · 26 unmodified lines | ||
| 27 | 27 | arm/mpegvideo_arm.o \ |
| 28 | 28 | arm/simple_idct_arm.o \ |
| 29 | 29 | |
| 30 | −OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \ | |
| 30 | +ARMV5TE-OBJS += arm/dsputil_init_armv5te.o \ | |
| 31 | 31 | arm/mpegvideo_armv5te.o \ |
| 32 | 32 | arm/mpegvideo_armv5te_s.o \ |
| 33 | 33 | arm/simple_idct_armv5te.o \ |
| 34 | 34 | |
| 35 | −OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \ | |
| 35 | +ARMV6-OBJS += arm/dsputil_init_armv6.o \ | |
| 36 | 36 | arm/dsputil_armv6.o \ |
| 37 | 37 | arm/simple_idct_armv6.o \ |
| 38 | − $(ARMV6-OBJS-yes) | |
| 39 | 38 | |
| 40 | −VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o \ | |
| 39 | +ARMVFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o | |
| 41 | 40 | |
| 42 | −OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \ | |
| 41 | +ARMVFP-OBJS += arm/dsputil_vfp.o \ | |
| 43 | 42 | arm/dsputil_init_vfp.o \ |
| 44 | − $(VFP-OBJS-yes) | |
| 45 | 43 | |
| 46 | 44 | NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ |
| 47 | 45 | arm/fft_fixed_neon.o \ |
| @@ -83,10 +81,9 @@ NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o \ · 35 unmodified lines | ||
| 83 | 81 | |
| 84 | 82 | NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_neon.o |
| 85 | 83 | |
| 86 | −OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \ | |
| 84 | +NEON-OBJS += arm/dsputil_init_neon.o \ | |
| 87 | 85 | arm/dsputil_neon.o \ |
| 88 | 86 | arm/fmtconvert_neon.o \ |
| 89 | 87 | arm/int_neon.o \ |
| 90 | 88 | arm/mpegvideo_neon.o \ |
| 91 | 89 | arm/simple_idct_neon.o \ |
| 92 | − $(NEON-OBJS-yes) | |
| @@ -1,3 +1,3 @@ | ||
| 1 | −OBJS-$(HAVE_MMI) += mips/dsputil_mmi.o \ | |
| 2 | − mips/idct_mmi.o \ | |
| 3 | − mips/mpegvideo_mmi.o \ | |
| 1 | +MMI-OBJS += mips/dsputil_mmi.o \ | |
| 2 | + mips/idct_mmi.o \ | |
| 3 | + mips/mpegvideo_mmi.o \ | |
| @@ -11,7 +11,7 @@ ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o · 10 unmodified lines | ||
| 11 | 11 | ALTIVEC-OBJS-$(CONFIG_VP6_DECODER) += ppc/vp3dsp_altivec.o |
| 12 | 12 | ALTIVEC-OBJS-$(CONFIG_VP8_DECODER) += ppc/vp8dsp_altivec.o |
| 13 | 13 | |
| 14 | −OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \ | |
| 14 | +ALTIVEC-OBJS += ppc/dsputil_altivec.o \ | |
| 15 | 15 | ppc/fdct_altivec.o \ |
| 16 | 16 | ppc/float_altivec.o \ |
| 17 | 17 | ppc/fmtconvert_altivec.o \ |
| @@ -19,4 +19,3 @@ OBJS-$(HAVE_ALTIVEC) += ppc/dsputil_altivec.o \ · 1 unmodified line | ||
| 19 | 19 | ppc/idct_altivec.o \ |
| 20 | 20 | ppc/int_altivec.o \ |
| 21 | 21 | ppc/mpegvideo_altivec.o \ |
| 22 | − $(ALTIVEC-OBJS-yes) | |
| @@ -1,2 +1,2 @@ | ||
| 1 | −OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ | |
| 2 | − sparc/simple_idct_vis.o \ | |
| 1 | +VIS-OBJS += sparc/dsputil_vis.o \ | |
| 2 | + sparc/simple_idct_vis.o \ | |
| @@ -2,7 +2,7 @@ OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o · 1 unmodified line | ||
| 2 | 2 | OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o |
| 3 | 3 | OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o |
| 4 | 4 | |
| 5 | −OBJS-$(HAVE_MMX) += x86/dsputil_mmx.o \ | |
| 5 | +MMX-OBJS += x86/dsputil_mmx.o \ | |
| 6 | 6 | x86/fdct_mmx.o \ |
| 7 | 7 | x86/fmtconvert_mmx.o \ |
| 8 | 8 | x86/idct_mmx_xvid.o \ |
| @@ -66,7 +66,6 @@ YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp3dsp.o \ · 57 unmodified lines | ||
| 66 | 66 | x86/vp56dsp.o |
| 67 | 67 | YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o |
| 68 | 68 | |
| 69 | −MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \ | |
| 69 | +YASM-OBJS += x86/dsputil_yasm.o \ | |
| 70 | 70 | x86/deinterlace.o \ |
| 71 | 71 | x86/fmtconvert.o \ |
| 72 | − $(YASM-OBJS-yes) | |
| @@ -15,14 +15,14 @@ OBJS = input.o \ · 14 unmodified lines | ||
| 15 | 15 | OBJS-$(ARCH_BFIN) += bfin/internal_bfin.o \ |
| 16 | 16 | bfin/swscale_bfin.o \ |
| 17 | 17 | bfin/yuv2rgb_bfin.o |
| 18 | −OBJS-$(HAVE_ALTIVEC) += ppc/swscale_altivec.o \ | |
| 18 | +ALTIVEC-OBJS += ppc/swscale_altivec.o \ | |
| 19 | 19 | ppc/yuv2rgb_altivec.o \ |
| 20 | 20 | ppc/yuv2yuv_altivec.o |
| 21 | −OBJS-$(HAVE_MMX) += x86/rgb2rgb.o \ | |
| 21 | +MMX-OBJS += x86/rgb2rgb.o \ | |
| 22 | 22 | x86/swscale_mmx.o \ |
| 23 | 23 | x86/yuv2rgb_mmx.o |
| 24 | −OBJS-$(HAVE_VIS) += sparc/yuv2rgb_vis.o | |
| 25 | −MMX-OBJS-$(HAVE_YASM) += x86/input.o \ | |
| 24 | +VIS-OBJS += sparc/yuv2rgb_vis.o | |
| 25 | +YASM-OBJS += x86/input.o \ | |
| 26 | 26 | x86/output.o \ |
| 27 | 27 | x86/scale.o |
| 28 | 28 | |