shithub: openh264

Download patch

ref: 764f787dcbde7c608fe16f8fe9291dffedbde371
parent: 788b67cbde2bd89283ca403aa5a7dbddc4090711
author: Martin Storsjö <[email protected]>
date: Wed Apr 23 06:44:44 EDT 2014 

Rename the makefile variable for arm assembly sources

This is in preparation for adding support for the aarc64 assembly
files as well.


--- a/build/mktargets.py
+++ b/build/mktargets.py
@@ -142,11 +142,11 @@
 
 if len(sfiles) > 0:
     f.write("ifeq ($(ASM_ARCH), arm)\n")
-    f.write("%s_ASM_S_SRCS=\\\n"%(PREFIX))
+    f.write("%s_ASM_ARM_SRCS=\\\n"%(PREFIX))
     for c in sfiles:
         f.write("\t$(%s_SRCDIR)/%s\\\n"%(PREFIX, c))
     f.write("\n")
-    f.write("%s_OBJS += $(%s_ASM_S_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX))
+    f.write("%s_OBJS += $(%s_ASM_ARM_SRCS:.S=.$(OBJ))\n"%(PREFIX, PREFIX))
     f.write("endif\n\n")
 
 f.write("OBJS += $(%s_OBJS)\n"%PREFIX)
--- a/codec/common/targets.mk
+++ b/codec/common/targets.mk
@@ -25,13 +25,13 @@
 endif
 
 ifeq ($(ASM_ARCH), arm)
-COMMON_ASM_S_SRCS=\
+COMMON_ASM_ARM_SRCS=\
 	$(COMMON_SRCDIR)/arm/copy_mb_neon.S\
 	$(COMMON_SRCDIR)/arm/deblocking_neon.S\
 	$(COMMON_SRCDIR)/arm/expand_picture_neon.S\
 	$(COMMON_SRCDIR)/arm/mc_neon.S\
 
-COMMON_OBJS += $(COMMON_ASM_S_SRCS:.S=.$(OBJ))
+COMMON_OBJS += $(COMMON_ASM_ARM_SRCS:.S=.$(OBJ))
 endif
 
 OBJS += $(COMMON_OBJS)
--- a/codec/decoder/targets.mk
+++ b/codec/decoder/targets.mk
@@ -35,11 +35,11 @@
 endif
 
 ifeq ($(ASM_ARCH), arm)
-DECODER_ASM_S_SRCS=\
+DECODER_ASM_ARM_SRCS=\
 	$(DECODER_SRCDIR)/core/arm/block_add_neon.S\
 	$(DECODER_SRCDIR)/core/arm/intra_pred_neon.S\
 
-DECODER_OBJS += $(DECODER_ASM_S_SRCS:.S=.$(OBJ))
+DECODER_OBJS += $(DECODER_ASM_ARM_SRCS:.S=.$(OBJ))
 endif
 
 OBJS += $(DECODER_OBJS)
--- a/codec/encoder/targets.mk
+++ b/codec/encoder/targets.mk
@@ -50,7 +50,7 @@
 endif
 
 ifeq ($(ASM_ARCH), arm)
-ENCODER_ASM_S_SRCS=\
+ENCODER_ASM_ARM_SRCS=\
 	$(ENCODER_SRCDIR)/core/arm/intra_pred_neon.S\
 	$(ENCODER_SRCDIR)/core/arm/intra_pred_sad_3_opt_neon.S\
 	$(ENCODER_SRCDIR)/core/arm/memory_neon.S\
@@ -57,7 +57,7 @@
 	$(ENCODER_SRCDIR)/core/arm/pixel_neon.S\
 	$(ENCODER_SRCDIR)/core/arm/reconstruct_neon.S\
 
-ENCODER_OBJS += $(ENCODER_ASM_S_SRCS:.S=.$(OBJ))
+ENCODER_OBJS += $(ENCODER_ASM_ARM_SRCS:.S=.$(OBJ))
 endif
 
 OBJS += $(ENCODER_OBJS)
--- a/codec/processing/targets.mk
+++ b/codec/processing/targets.mk
@@ -31,13 +31,13 @@
 endif
 
 ifeq ($(ASM_ARCH), arm)
-PROCESSING_ASM_S_SRCS=\
+PROCESSING_ASM_ARM_SRCS=\
 	$(PROCESSING_SRCDIR)/src/arm/adaptive_quantization.S\
 	$(PROCESSING_SRCDIR)/src/arm/down_sample_neon.S\
 	$(PROCESSING_SRCDIR)/src/arm/pixel_sad_neon.S\
 	$(PROCESSING_SRCDIR)/src/arm/vaa_calc_neon.S\
 
-PROCESSING_OBJS += $(PROCESSING_ASM_S_SRCS:.S=.$(OBJ))
+PROCESSING_OBJS += $(PROCESSING_ASM_ARM_SRCS:.S=.$(OBJ))
 endif
 
 OBJS += $(PROCESSING_OBJS)