History

Regenerate makefiles to include the encoder arm assembly

Martin Storsjö committed 12 years ago

Commit 4e4bfcc1 parent 45e059e3 files · +29 −0Browse files

Showing the changes to codec/processing (1 of 3 files). Show all

Unified · Split

codec/processing/targets.mk+13−0
@@ -29,6 +29,16 @@ PROCESSING_ASM_SRCS=\ · 28 unmodified lines
29PROCESSING_OBJS += $(PROCESSING_ASM_SRCS:.asm=.o)29PROCESSING_OBJS += $(PROCESSING_ASM_SRCS:.asm=.o)
30endif30endif
31 31
32ifeq ($(ASM_ARCH), arm)
33PROCESSING_ASM_S_SRCS=\
34 $(PROCESSING_SRCDIR)/src/arm/adaptive_quantization.S\
35 $(PROCESSING_SRCDIR)/src/arm/down_sample_neon.S\
36 $(PROCESSING_SRCDIR)/src/arm/pixel_sad_neon.S\
37 $(PROCESSING_SRCDIR)/src/arm/vaa_calc_neon.S\
38
39PROCESSING_OBJS += $(PROCESSING_ASM_S_SRCS:.S=.o)
40endif
41
32OBJS += $(PROCESSING_OBJS)42OBJS += $(PROCESSING_OBJS)
33$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.cpp43$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.cpp
34 $(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c $(CXX_O) $<44 $(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c $(CXX_O) $<
@@ -36,6 +46,9 @@ $(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.cpp · 1 unmodified line
36$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.asm46$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.asm
37 $(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(PROCESSING_ASMFLAGS) $(PROCESSING_ASM_INCLUDES) -o $@ $<47 $(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(PROCESSING_ASMFLAGS) $(PROCESSING_ASM_INCLUDES) -o $@ $<
38 48
49$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.S
50 $(QUIET_CCAS)$(CCAS) $(CFLAGS) $(ASMFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c -o $@ $<
51
39$(LIBPREFIX)processing.$(LIBSUFFIX): $(PROCESSING_OBJS)52$(LIBPREFIX)processing.$(LIBSUFFIX): $(PROCESSING_OBJS)
40 $(QUIET)rm -f $@53 $(QUIET)rm -f $@
41 $(QUIET_AR)$(AR) $(AR_OPTS) $+54 $(QUIET_AR)$(AR) $(AR_OPTS) $+

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