History

build: Consistently handle conditional compilation for all optimization OBJS.

Diego Biurrun committed 14 years ago

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

Showing the changes to libavcodec/arm (1 of 9 files). Show all

Unified · Split

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)

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