ref: 5f8822644f4f01a19945d928a6832f0ab309d108
parent: c2dd7df0f24fcd9b32b2349df0728fe99cb23112
parent: 7fc869cf0f89872967afe5fe15e34d856c8d8e0c
author: huili2 <[email protected]>
date: Wed Jul 9 06:14:04 EDT 2014
Merge pull request #1108 from mstorsjo/regenerate-makefiles Regenerate the targets.mk files I'm not able to see the changes in rbcommons (strange), so directly look at here.
--- a/codec/encoder/targets.mk
+++ b/codec/encoder/targets.mk
@@ -63,7 +63,7 @@
$(ENCODER_SRCDIR)/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S\
$(ENCODER_SRCDIR)/core/arm64/memory_aarch64_neon.S\
$(ENCODER_SRCDIR)/core/arm64/pixel_aarch64_neon.S\
- $(ENCODER_SRCDIR)/core/arm64/reconstruct_aarch64_neon.S\
+ $(ENCODER_SRCDIR)/core/arm64/reconstruct_aarch64_neon.S\
ENCODER_OBJS += $(ENCODER_ASM_ARM64_SRCS:.S=.$(OBJ))
endif
--- a/test/encoder/targets.mk
+++ b/test/encoder/targets.mk
@@ -10,7 +10,7 @@
$(ENCODER_UNITTEST_SRCDIR)/EncUT_MemoryAlloc.cpp\
$(ENCODER_UNITTEST_SRCDIR)/EncUT_MemoryZero.cpp\
$(ENCODER_UNITTEST_SRCDIR)/EncUT_MotionEstimate.cpp\
- $(ENCODER_UNITTEST_SRCDIR)/EncUT_Reconstruct.cpp\
+ $(ENCODER_UNITTEST_SRCDIR)/EncUT_Reconstruct.cpp\
$(ENCODER_UNITTEST_SRCDIR)/EncUT_Sample.cpp\
ENCODER_UNITTEST_OBJS += $(ENCODER_UNITTEST_CPP_SRCS:.cpp=.$(OBJ))