summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorWonsik Jung <sidein@samsung.com>2016-01-05 16:41:14 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-01-05 17:01:45 +0900
commit7db9613e8c95268acfa6d51ea6aa45418ee8e697 (patch)
tree90c8b334eaef11377194911c3bfeac5a1ce02c7c /src/Makefile_Evas.am
parentc1b4728487715c66120ed4c4d75065012bd42682 (diff)
Evas_Engine: add TBM surface and clean up Native Struct
Summary: Add TBM surface in wayland and clean up Native struct on Evas Engine. Previous TBM surface for evas_object_image's native_surface_set is only in Evas X11 backend. This patch has the code for wayland backend. In addition, evas_native_tbm.c is moved to software_generic. Becuase this file is common. And, Native in Evas_Engine is clean-up. @feature Test Plan: TBM surface is tested with spacegrapher's test app(tbm.c) in Tizen Device. Pixmap surface is tested in ubuntu with same test app. EvasGL is tested with elementary_test. Reviewers: jpeg, spacegrapher, raster, cedric Subscribers: dkdk, scholb.kim, JoogabYun Differential Revision: https://phab.enlightenment.org/D3501
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index d5b3167d09..43f11d7e68 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -577,13 +577,12 @@ modules/evas/engines/software_generic/evas_ector_software_buffer.eo
577### Engines 577### Engines
578 578
579if EVAS_STATIC_BUILD_SOFTWARE_GENERIC 579if EVAS_STATIC_BUILD_SOFTWARE_GENERIC
580BUILT_SOURCES += \
581 modules/evas/engines/software_generic/evas_ector_software_buffer.eo.c \
582 modules/evas/engines/software_generic/evas_ector_software_buffer.eo.h
583lib_evas_libevas_la_SOURCES += \ 580lib_evas_libevas_la_SOURCES += \
584 modules/evas/engines/software_generic/evas_engine.c \ 581modules/evas/engines/software_generic/evas_engine.c \
585 modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h \ 582modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h \
586 modules/evas/engines/software_generic/evas_ector_software_buffer.c 583modules/evas/engines/software_generic/evas_native_tbm.c \
584modules/evas/engines/software_generic/evas_ector_software_buffer.c \
585modules/evas/engines/software_generic/evas_native_common.h
587lib_evas_libevas_la_LIBADD += 586lib_evas_libevas_la_LIBADD +=
588lib_evas_libevas_la_CPPFLAGS += -I$(top_srcdir)/src/lib/ector 587lib_evas_libevas_la_CPPFLAGS += -I$(top_srcdir)/src/lib/ector
589else 588else
@@ -595,7 +594,12 @@ enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/mod
595install_enginesoftwaregenericpkgLTLIBRARIES = install-enginesoftwaregenericpkgLTLIBRARIES 594install_enginesoftwaregenericpkgLTLIBRARIES = install-enginesoftwaregenericpkgLTLIBRARIES
596$(install_enginesoftwaregenericpkgLTLIBRARIES): install-libLTLIBRARIES 595$(install_enginesoftwaregenericpkgLTLIBRARIES): install-libLTLIBRARIES
597 596
598modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h 597modules_evas_engines_software_generic_module_la_SOURCES = \
598modules/evas/engines/software_generic/evas_engine.c \
599modules/evas/engines/software_generic/Evas_Engine_Software_Generic.h \
600modules/evas/engines/software_generic/evas_native_tbm.c \
601modules/evas/engines/software_generic/evas_ector_software_buffer.c \
602modules/evas/engines/software_generic/evas_native_common.h
599modules_evas_engines_software_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 603modules_evas_engines_software_generic_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
600-I$(top_srcdir)/src/lib/evas/include \ 604-I$(top_srcdir)/src/lib/evas/include \
601-I$(top_srcdir)/src/lib/evas/cserve2 \ 605-I$(top_srcdir)/src/lib/evas/cserve2 \
@@ -1075,8 +1079,7 @@ SOFTWARE_X11_SOURCES = \
1075modules/evas/engines/software_x11/evas_engine.c \ 1079modules/evas/engines/software_x11/evas_engine.c \
1076modules/evas/engines/software_x11/evas_engine.h \ 1080modules/evas/engines/software_x11/evas_engine.h \
1077modules/evas/engines/software_x11/evas_x_egl.c \ 1081modules/evas/engines/software_x11/evas_x_egl.c \
1078modules/evas/engines/software_x11/evas_x_egl.h \ 1082modules/evas/engines/software_x11/evas_x_egl.h
1079modules/evas/engines/software_x11/evas_native_tbm.c
1080SOFTWARE_X11_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 1083SOFTWARE_X11_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
1081-I$(top_srcdir)/src/lib/evas/include \ 1084-I$(top_srcdir)/src/lib/evas/include \
1082-I$(top_srcdir)/src/lib/evas/cserve2 \ 1085-I$(top_srcdir)/src/lib/evas/cserve2 \