diff options
| author | Tristan Matthews <tmatth@videolan.org> | 2014-10-12 23:12:52 +0400 |
|---|---|---|
| committer | Tristan Matthews <tmatth@videolan.org> | 2014-10-12 23:12:52 +0400 |
| commit | fd562eefa2f7b506d7bedd42335e97256c067d6e (patch) | |
| tree | d07bebc7bd7331be4815141d26d515aa6ba62bdf | |
| parent | 32ff38bc8a3f1eba8cd27721cf4ce834ad12f9ad (diff) | |
tests: fix linking for --enable-fixed-point on ARMv1.1.1-beta
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | celt/tests/test_unit_mathops.c | 2 | ||||
| -rw-r--r-- | celt/tests/test_unit_rotation.c | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index bcfeb20b..e20f7b41 100644 --- a/Makefile.am +++ b/Makefile.am @@ -106,12 +106,22 @@ celt_tests_test_unit_laplace_LDADD = $(LIBM) celt_tests_test_unit_mathops_SOURCES = celt/tests/test_unit_mathops.c celt_tests_test_unit_mathops_LDADD = $(LIBM) +if CPU_ARM +if OPUS_ARM_EXTERNAL_ASM +celt_tests_test_unit_mathops_LDADD += libopus.la +endif +endif celt_tests_test_unit_mdct_SOURCES = celt/tests/test_unit_mdct.c celt_tests_test_unit_mdct_LDADD = $(LIBM) celt_tests_test_unit_rotation_SOURCES = celt/tests/test_unit_rotation.c celt_tests_test_unit_rotation_LDADD = $(LIBM) +if CPU_ARM +if OPUS_ARM_EXTERNAL_ASM +celt_tests_test_unit_rotation_LDADD += libopus.la +endif +endif celt_tests_test_unit_types_SOURCES = celt/tests/test_unit_types.c celt_tests_test_unit_types_LDADD = $(LIBM) diff --git a/celt/tests/test_unit_mathops.c b/celt/tests/test_unit_mathops.c index 5296f324..3076bbfb 100644 --- a/celt/tests/test_unit_mathops.c +++ b/celt/tests/test_unit_mathops.c @@ -56,6 +56,8 @@ #include "x86/celt_lpc_sse.c" #endif #include "x86/x86_celt_map.c" +#elif defined(OPUS_ARM_ASM) && defined(FIXED_POINT) +#include "arm/arm_celt_map.c" #endif #ifdef FIXED_POINT diff --git a/celt/tests/test_unit_rotation.c b/celt/tests/test_unit_rotation.c index 4dce1af7..37ba74e7 100644 --- a/celt/tests/test_unit_rotation.c +++ b/celt/tests/test_unit_rotation.c @@ -54,6 +54,8 @@ #include "x86/celt_lpc_sse.c" #endif #include "x86/x86_celt_map.c" +#elif defined(OPUS_ARM_ASM) && defined(FIXED_POINT) +#include "arm/arm_celt_map.c" #endif #define MAX_SIZE 100 |