From 2e8f00c1ff0addfe32cfef329e808e8ef41c7a6f Mon Sep 17 00:00:00 2001 From: Wonki Kim Date: Thu, 27 Sep 2018 14:23:51 +0900 Subject: [PATCH] evas: Modify configure to branch by architectures for neon Summary: neon code is only needed to be included for the arm architecture. so that this code modify automake configure files to support it. Reviewers: Hermet Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7096 --- configure.ac | 2 ++ src/Makefile_Evas.am | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/configure.ac b/configure.ac index 8685d7cc8d..65f695c35d 100644 --- a/configure.ac +++ b/configure.ac @@ -657,6 +657,7 @@ case $host_cpu in AC_DEFINE([BUILD_NEON], [1], [Build NEON Code]) AC_DEFINE([BUILD_NEON_INTRINSICS], [1], [Build NEON Intrinsics]) build_cpu_neon="yes" + build_cpu_neon_intrinsics="yes" ],[ AC_MSG_RESULT([no]) build_cpu_neon="no" @@ -666,6 +667,7 @@ case $host_cpu in esac AM_CONDITIONAL([BUILD_NEON], [test "${build_cpu_neon}" = "yes"]) +AM_CONDITIONAL([BUILD_NEON_INTRINSICS], [test "${build_cpu_neon_intrinsics}" = "yes"]) AC_SUBST([ALTIVEC_CFLAGS]) AC_SUBST([SSE3_CFLAGS]) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 7866a16760..403c669044 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -461,6 +461,12 @@ lib/evas/common/evas_font_ot.h \ lib/evas/common/evas_font_draw.h \ lib/evas/common/evas_common_generic_cache.c +if BUILD_NEON +if !BUILD_NEON_INTRINSICS +lib_evas_libevas_la_SOURCES += \ +lib/evas/common/evas_op_copy/op_copy_neon.S +endif +endif lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -I$(top_srcdir)/src/lib/evas/canvas \