ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/examples.git/commit/?id=4a12c6f802ac5c7d20116661be7fa7148da9f619
commit 4a12c6f802ac5c7d20116661be7fa7148da9f619
Author: Andy Williams <a...@andywilliams.me>
Date: Wed Nov 15 18:05:20 2017 +0000
efl_ui: Update deps and includes to match
Also don't worry about multiple efl deps - just grab the one you need
---
tutorial/c/hello-cmdline/meson.build | 3 +--
tutorial/c/hello-cmdline/src/cmdline_main.c | 1 +
tutorial/c/hello-cmdline/src/meson.build | 2 +-
tutorial/c/hello-gui/meson.build | 4 ++--
tutorial/c/hello-gui/src/gui_main.c | 2 +-
tutorial/c/hello-gui/src/meson.build | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tutorial/c/hello-cmdline/meson.build
b/tutorial/c/hello-cmdline/meson.build
index d446ddd..0a05fab 100644
--- a/tutorial/c/hello-cmdline/meson.build
+++ b/tutorial/c/hello-cmdline/meson.build
@@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
-efl = dependency('efl', version : '>=1.20.99')
-efl_core = dependency('efl-core', version : '>=1.20.99')
+efl = dependency('efl-core', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
diff --git a/tutorial/c/hello-cmdline/src/cmdline_main.c
b/tutorial/c/hello-cmdline/src/cmdline_main.c
index 9ec984d..335c89f 100644
--- a/tutorial/c/hello-cmdline/src/cmdline_main.c
+++ b/tutorial/c/hello-cmdline/src/cmdline_main.c
@@ -1,6 +1,7 @@
#define EFL_EO_API_SUPPORT 1
#define EFL_BETA_API_SUPPORT 1
+#include <Eina.h>
#include <Efl_Core.h>
EAPI_MAIN void
diff --git a/tutorial/c/hello-cmdline/src/meson.build
b/tutorial/c/hello-cmdline/src/meson.build
index b1d01da..39097ed 100644
--- a/tutorial/c/hello-cmdline/src/meson.build
+++ b/tutorial/c/hello-cmdline/src/meson.build
@@ -2,7 +2,7 @@ src = files([
'cmdline_main.c',
])
-deps = [eina, efl, efl_core]
+deps = [eina, efl]
executable('efl_example_cmdline', src,
dependencies : deps,
diff --git a/tutorial/c/hello-gui/meson.build b/tutorial/c/hello-gui/meson.build
index 5e04c63..18eb9f8 100644
--- a/tutorial/c/hello-gui/meson.build
+++ b/tutorial/c/hello-gui/meson.build
@@ -5,8 +5,8 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
-efl = dependency('efl', version : '>=1.20.99')
-efl_ui = dependency('efl-ui', version : '>=1.20.99')
+efl = dependency('efl-ui', version : '>=1.20.99')
+elm = dependency('elementary', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
diff --git a/tutorial/c/hello-gui/src/gui_main.c
b/tutorial/c/hello-gui/src/gui_main.c
index f99f753..e340f52 100644
--- a/tutorial/c/hello-gui/src/gui_main.c
+++ b/tutorial/c/hello-gui/src/gui_main.c
@@ -2,8 +2,8 @@
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
-#include <Efl.h>
#include <Elementary.h>
+#include <Efl_Ui.h>
static void
_gui_editor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
diff --git a/tutorial/c/hello-gui/src/meson.build
b/tutorial/c/hello-gui/src/meson.build
index 2df4d7a..4addb69 100644
--- a/tutorial/c/hello-gui/src/meson.build
+++ b/tutorial/c/hello-gui/src/meson.build
@@ -2,7 +2,7 @@ src = files([
'gui_main.c',
])
-deps = [eina, efl, efl_ui]
+deps = [eina, efl, elm]
executable('efl_example_gui', src,
dependencies : deps,
--
