History

build: Consistently handle conditional compilation for all optimization OBJS.

Diego Biurrun committed 14 years ago

Commit 7bb3a301 parent 2ef15b49 files · +33 −24Browse files

Unified · Split

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

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t