build: Update deps to efl-core

This commit is contained in:
Andy Williams 2017-11-15 18:22:44 +00:00
parent 4a12c6f802
commit 0782aa5671
19 changed files with 22 additions and 33 deletions

View File

@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
efl = dependency('efl-core', version : '>=1.20.99')
eolian = dependency('eolian', version : '>=1.20.99')
inc = include_directories('.')

View File

@ -2,8 +2,7 @@
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>
#include <Elementary.h>
#include <Efl_Core.h>
#include "example_rectangle.eo.h"
Example_Rectangle *

View File

@ -23,7 +23,7 @@ src = files([
'eo_classes_main.c',
])
deps = [eina, efl, elm]
deps = [eina, efl]
executable('efl_example_eo_classes', src, eo_csrc, eo_gen,
dependencies : deps,

View File

@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
efl = dependency('efl-core', version : '>=1.20.99')
eolian = dependency('eolian', version : '>=1.20.99')
inc = include_directories('.')

View File

@ -7,8 +7,7 @@
#endif
#include <Eina.h>
#include <Efl.h>
#include <Elementary.h>
#include <Efl_Core.h>
#include "example_shape.eo.h"
#include "example_rectangle.eo.h"

View File

@ -24,7 +24,7 @@ src = files([
'eo_inherit_main.c',
])
deps = [eina, efl, elm]
deps = [eina, efl]
executable('efl_example_eo_inherit', src, eo_csrc, eo_gen,
dependencies : deps,

View File

@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
efl = dependency('efl-core', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')

View File

@ -2,8 +2,7 @@
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>
#include <Elementary.h>
#include <Efl_Core.h>
#include <stdlib.h>

View File

@ -2,7 +2,7 @@ src = files([
'eo_intro_main.c',
])
deps = [eina, efl, elm]
deps = [eina, efl]
executable('efl_example_eo_intro', src,
dependencies : deps,

View File

@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
efl = dependency('efl-core', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')

View File

@ -2,8 +2,7 @@
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>
#include <Elementary.h>
#include <Efl_Core.h>
#include <stdlib.h>

View File

@ -2,7 +2,7 @@ src = files([
'eo_refcount_main.c',
])
deps = [eina, efl, elm]
deps = [eina, efl]
executable('efl_example_eo_refcount', src,
dependencies : deps,

View File

@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
efl = dependency('efl-core', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')

View File

@ -4,7 +4,7 @@ src = files([
])
lib = shared_library('example', src,
dependencies : [eina, efl, elm],
dependencies : [eina, efl],
include_directories : inc,
version : meson.project_version(),
install : true

View File

@ -7,7 +7,7 @@ src = files([
check = dependency('check')
exe = executable('example-test', src,
dependencies : [eina, efl, elm, check, example_lib],
dependencies : [eina, efl, check, example_lib],
include_directories : inc,
c_args : '-DPACKAGE_BUILD_DIR="' + meson.build_root() + '"',
install : false

View File

@ -2,7 +2,7 @@
#define EFL_BETA_API_SUPPORT 1
#include <check.h>
#include <Elementary.h>
#include <Efl_Core.h>
#include <Example.h>
#include "suite.h"

View File

@ -5,8 +5,7 @@ project(
meson_version : '>= 0.38.0')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
efl = dependency('efl-core', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')

View File

@ -2,10 +2,9 @@
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>
#include <Elementary.h>
#include <Efl_Core.h>
/*
/*
* These are some helper methods for triggering lifecycle events for the purpose of this demo.
* efl_pause and efl_resume may never be called for your application, depending on your environment.
* This demo triggers them directly to show how you can respond.
@ -13,7 +12,7 @@
static void
_method_delay_call(Efl_Event_Cb method, double delay, Efl_Loop *loop)
{
efl_add(EFL_LOOP_TIMER_CLASS, loop,
efl_add(EFL_LOOP_TIMER_CLASS, loop,
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TICK, method, loop),
efl_loop_timer_interval_set(efl_added, delay));
}
@ -56,7 +55,7 @@ efl_resume(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{
printf("Lifecycle: resumed\n");
}
EAPI void
efl_terminate(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
{

View File

@ -2,7 +2,7 @@ src = files([
'lifecycle_main.c',
])
deps = [eina, efl, elm]
deps = [eina, efl]
executable('efl_example_lifecycle', src,
dependencies : deps,