ref: 8f981a4282f0bc3356e2ac4d3d9aaa83a01b093b
parent: 975a3e41bc91f59222dc7cbb5b07c9b5b715c164
parent: dae8f4b7377e9a085c010e61d03153f86dd18dc5
author: Licai Guo <licaguo@cisco.com>
date: Wed Mar 5 01:16:51 EST 2014
Merge pull request #409 from mstorsjo/exclude-arm-header Exclude the arm assembly header as well
--- a/build/mktargets.sh
+++ b/build/mktargets.sh
@@ -1,7 +1,7 @@
#!/bin/sh
python build/mktargets.py --directory codec/decoder --library decoder
python build/mktargets.py --directory codec/encoder --library encoder --exclude DllEntry.cpp
-python build/mktargets.py --directory codec/common --library common --exclude asm_inc.asm
+python build/mktargets.py --directory codec/common --library common --exclude asm_inc.asm --exclude arm_arch_common_macro.S
python build/mktargets.py --directory codec/processing --library processing
python build/mktargets.py --directory codec/console/dec --binary h264dec
--- a/codec/common/targets.mk
+++ b/codec/common/targets.mk
@@ -24,7 +24,6 @@
ifeq ($(ASM_ARCH), arm)
COMMON_ASM_S_SRCS=\
- $(COMMON_SRCDIR)/arm_arch_common_macro.S\
$(COMMON_SRCDIR)/deblocking_neon.S\
COMMON_OBJS += $(COMMON_ASM_S_SRCS:.S=.o)