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
2727 arm/mpegvideo_arm.o \
2828 arm/simple_idct_arm.o \
2929
30−OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \
30+ARMV5TE-OBJS += arm/dsputil_init_armv5te.o \
3131 arm/mpegvideo_armv5te.o \
3232 arm/mpegvideo_armv5te_s.o \
3333 arm/simple_idct_armv5te.o \
3434
35−OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \
35+ARMV6-OBJS += arm/dsputil_init_armv6.o \
3636 arm/dsputil_armv6.o \
3737 arm/simple_idct_armv6.o \
38− $(ARMV6-OBJS-yes)
3938
40−VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o \
39+ARMVFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o
4140
42−OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \
41+ARMVFP-OBJS += arm/dsputil_vfp.o \
4342 arm/dsputil_init_vfp.o \
44− $(VFP-OBJS-yes)
4543
4644 NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \
4745 arm/fft_fixed_neon.o \
@@ -83,10 +81,9 @@ NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o \ · 35 unmodified lines
8381
8482 NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_neon.o
8583
86−OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \
84+NEON-OBJS += arm/dsputil_init_neon.o \
8785 arm/dsputil_neon.o \
8886 arm/fmtconvert_neon.o \
8987 arm/int_neon.o \
9088 arm/mpegvideo_neon.o \
9189 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