From 34a21d7ef95914d9c221605340011769420a78cc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 27 Sep 2019 10:06:30 -0400 Subject: [PATCH] efl/canvas: add Efl_Canvas.h this includes all the efl.canvas headers and adds some compilation tests for the header to the unit test suite ref T8274 Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D10226 --- src/lib/evas/Efl_Canvas.h | 116 ++++++++++++++++++++++++++++++ src/lib/evas/meson.build | 1 + src/tests/evas/efl_test_canvas.c | 2 + src/tests/evas/efl_test_canvas2.c | 2 + src/tests/evas/efl_test_canvas3.c | 2 + src/tests/evas/meson.build | 5 +- 6 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 src/lib/evas/Efl_Canvas.h create mode 100644 src/tests/evas/efl_test_canvas.c create mode 100644 src/tests/evas/efl_test_canvas2.c create mode 100644 src/tests/evas/efl_test_canvas3.c diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h new file mode 100644 index 0000000000..66fe692a72 --- /dev/null +++ b/src/lib/evas/Efl_Canvas.h @@ -0,0 +1,116 @@ +#ifndef _EFL_CANVAS_H +#define _EFL_CANVAS_H + +#include + +#include + +#include +/* This include has been added to support Eo in Evas */ +#include +#ifdef EAPI +# undef EAPI +#endif + +#ifdef _WIN32 +# ifdef EFL_BUILD +# ifdef DLL_EXPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI +# endif +# else +# define EAPI __declspec(dllimport) +# endif +#else +# ifdef __GNUC__ +# if __GNUC__ >= 4 +# define EAPI __attribute__ ((visibility("default"))) +# else +# define EAPI +# endif +# else +# define EAPI +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/* FIXME: this uses EVAS types in its API and is broken. +#include +*/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#ifdef __cplusplus +} +#endif +#undef EAPI +#endif diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build index 3f39e294b5..e1165bebc2 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -85,6 +85,7 @@ evas_header_src = [ 'Evas_GL.h', 'Evas_Legacy.h', 'Evas_Loader.h', + 'Efl_Canvas.h', ] evas_include_directories += [ diff --git a/src/tests/evas/efl_test_canvas.c b/src/tests/evas/efl_test_canvas.c new file mode 100644 index 0000000000..3621e4cd5a --- /dev/null +++ b/src/tests/evas/efl_test_canvas.c @@ -0,0 +1,2 @@ +#undef EFL_BETA_API_SUPPORT +#include "Efl_Canvas.h" diff --git a/src/tests/evas/efl_test_canvas2.c b/src/tests/evas/efl_test_canvas2.c new file mode 100644 index 0000000000..5d7eaa36c1 --- /dev/null +++ b/src/tests/evas/efl_test_canvas2.c @@ -0,0 +1,2 @@ +#define EFL_NOLEGACY_API_SUPPORT +#include "Efl_Canvas.h" diff --git a/src/tests/evas/efl_test_canvas3.c b/src/tests/evas/efl_test_canvas3.c new file mode 100644 index 0000000000..317c472c58 --- /dev/null +++ b/src/tests/evas/efl_test_canvas3.c @@ -0,0 +1,2 @@ +//#define EFL_BETA_API_SUPPORT defined by build system already +#include "Efl_Canvas.h" diff --git a/src/tests/evas/meson.build b/src/tests/evas/meson.build index 602a9b9f16..62d744a5db 100644 --- a/src/tests/evas/meson.build +++ b/src/tests/evas/meson.build @@ -17,7 +17,10 @@ evas_suite_src = [ 'evas_test_focus.c', 'evas_test_events.c', 'evas_tests_helpers.h', - 'evas_suite.h' + 'evas_suite.h', + 'efl_test_canvas.c', + 'efl_test_canvas2.c', + 'efl_test_canvas3.c', ] evas_suite = executable('evas_suite',