tests: fix linking for --enable-fixed-point on ARM v1.1.1-beta
authorTristan Matthews <tmatth@videolan.org>
Sun, 12 Oct 2014 19:12:52 +0000 (15:12 -0400)
committerTristan Matthews <tmatth@videolan.org>
Sun, 12 Oct 2014 19:12:52 +0000 (15:12 -0400)
Makefile.am
celt/tests/test_unit_mathops.c
celt/tests/test_unit_rotation.c

index bcfeb20..e20f7b4 100644 (file)
@@ -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)
index 5296f32..3076bbf 100644 (file)
@@ -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
index 4dce1af..37ba74e 100644 (file)
@@ -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