aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorFrank Barchard <fbarchard@google.com>2015-10-07 21:16:51 -0700
committerFrank Barchard <fbarchard@google.com>2015-10-07 21:16:51 -0700
commit2d601aaf3482720de65cc6d60ec25eb6a4afa46e (patch)
tree64b6659cb35b9cc2c072b613d613ae7f2a30c55d /CMakeLists.txt
parent76a599ec3bac95f84a403881e1b8bf83d9532eec (diff)
downloadlibyuv-2d601aaf3482720de65cc6d60ec25eb6a4afa46e.tar.gz
merge neon source files back into single libyuv library
previously the neon source code was broken into a separate library built with -mfpu=neon for the neon assembly, while the C code was built without neon. In this change, the neon code is added to the main library and all code built with neon. TBR=harryjin@google.com BUG=libyuv:371 Review URL: https://codereview.chromium.org/1392043003 .
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b7deba1..82034977 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(ly_source_files
${ly_src_dir}/compare.cc
${ly_src_dir}/compare_common.cc
${ly_src_dir}/compare_neon.cc
+ ${ly_src_dir}/compare_neon64.cc
${ly_src_dir}/compare_gcc.cc
${ly_src_dir}/compare_win.cc
${ly_src_dir}/convert.cc
@@ -33,12 +34,14 @@ set(ly_source_files
${ly_src_dir}/rotate_common.cc
${ly_src_dir}/rotate_mips.cc
${ly_src_dir}/rotate_neon.cc
+ ${ly_src_dir}/rotate_neon64.cc
${ly_src_dir}/rotate_gcc.cc
${ly_src_dir}/rotate_win.cc
${ly_src_dir}/row_any.cc
${ly_src_dir}/row_common.cc
${ly_src_dir}/row_mips.cc
${ly_src_dir}/row_neon.cc
+ ${ly_src_dir}/row_neon64.cc
${ly_src_dir}/row_gcc.cc
${ly_src_dir}/row_win.cc
${ly_src_dir}/scale.cc
@@ -47,6 +50,7 @@ set(ly_source_files
${ly_src_dir}/scale_common.cc
${ly_src_dir}/scale_mips.cc
${ly_src_dir}/scale_neon.cc
+ ${ly_src_dir}/scale_neon64.cc
${ly_src_dir}/scale_gcc.cc
${ly_src_dir}/scale_win.cc
${ly_src_dir}/video_common.cc