Commit 4ff62949 authored by Martin Storsjo's avatar Martin Storsjo

Allow building the arm assembler files, too

parent a19fbce3
......@@ -5,6 +5,14 @@ ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -I$(top_srcdir)/amrwbenc/inc -I$(top_srcdir)/common/include
if ARMV7NEON
AM_CFLAGS += -DARM -DARMV7 -DASM_OPT
else
if ARMV5E
AM_CFLAGS += -DARM -DASM_OPT
endif
endif
amrwbencincludedir = $(includedir)/vo-amrwbenc
amrwbencinclude_HEADERS = enc_if.h
......@@ -66,6 +74,36 @@ libvo_amrwbenc_la_SOURCES = \
$(ENC_SRC)/wb_vad.c \
$(ENC_SRC)/weight_a.c
if ARMV7NEON
libvo_amrwbenc_la_SOURCES += \
$(ENC_SRC)/asm/ARMV7/convolve_neon.s \
$(ENC_SRC)/asm/ARMV7/cor_h_vec_neon.s \
$(ENC_SRC)/asm/ARMV7/Deemph_32_neon.s \
$(ENC_SRC)/asm/ARMV7/Dot_p_neon.s \
$(ENC_SRC)/asm/ARMV7/Filt_6k_7k_neon.s \
$(ENC_SRC)/asm/ARMV7/Norm_Corr_neon.s \
$(ENC_SRC)/asm/ARMV7/pred_lt4_1_neon.s \
$(ENC_SRC)/asm/ARMV7/residu_asm_neon.s \
$(ENC_SRC)/asm/ARMV7/scale_sig_neon.s \
$(ENC_SRC)/asm/ARMV7/Syn_filt_32_neon.s \
$(ENC_SRC)/asm/ARMV7/syn_filt_neon.s
else
if ARMV5E
libvo_amrwbenc_la_SOURCES += \
$(ENC_SRC)/asm/ARMV5E/convolve_opt.s \
$(ENC_SRC)/asm/ARMV5E/cor_h_vec_opt.s \
$(ENC_SRC)/asm/ARMV5E/Deemph_32_opt.s \
$(ENC_SRC)/asm/ARMV5E/Dot_p_opt.s \
$(ENC_SRC)/asm/ARMV5E/Filt_6k_7k_opt.s \
$(ENC_SRC)/asm/ARMV5E/Norm_Corr_opt.s \
$(ENC_SRC)/asm/ARMV5E/pred_lt4_1_opt.s \
$(ENC_SRC)/asm/ARMV5E/residu_asm_opt.s \
$(ENC_SRC)/asm/ARMV5E/scale_sig_opt.s \
$(ENC_SRC)/asm/ARMV5E/Syn_filt_32_opt.s \
$(ENC_SRC)/asm/ARMV5E/syn_filt_opt.s
endif
endif
bin_PROGRAMS = amrwb-enc$(EXEEXT)
amrwb_enc_LDADD = libvo-amrwbenc.la
......
......@@ -12,7 +12,22 @@ AM_MAINTAINER_MODE
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
# Various options for configure
AC_ARG_ENABLE([armv5e],
[AS_HELP_STRING([--enable-armv5e],
[enable ARMV5E assembler (default is no)])],
[armv5e=$enableval], [armv5e=no])
AC_ARG_ENABLE([armv7neon],
[AS_HELP_STRING([--enable-armv7neon],
[enable ARMV7 neon assembler (default is no)])],
[armv7neon=$enableval], [armv7neon=no])
# Automake conditionals to set
AM_CONDITIONAL(ARMV5E, test x$armv5e = xyes)
AM_CONDITIONAL(ARMV7NEON, test x$armv7neon = xyes)
# Checks for programs.
AM_PROG_AS
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment