enlightenment
/
examples
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove config.h from our examples, it is not needed 

We do still need BETA defines, move them to the code for now
This commit is contained in:
Andy Williams 2017-10-31 16:50:22 +00:00
parent 0a622ba10b
commit c6db404395
12 changed files with 22 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
c-cmdline/meson.build
View File

@ -6,15 +6,6 @@ project(
add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
config_h = configuration_data()
config_h.set_quoted('PACKAGE', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
@ -22,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
configure_file(
output : 'config.h',
install : false,
configuration: config_h
)

5
c-cmdline/src/cmdline_main.c
View File

@ -1,6 +1,5 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#define EFL_EO_API_SUPPORT 1
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>

14
c-gui/meson.build
View File

@ -6,15 +6,6 @@ project(
add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
config_h = configuration_data()
config_h.set_quoted('PACKAGE', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
@ -22,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
configure_file(
output : 'config.h',
install : false,
configuration: config_h
)

15
c-gui/src/gui_main.c
View File

@ -1,11 +1,18 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#define EFL_EO_API_SUPPORT 1
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>
#include <Elementary.h>
static void
_gui_editor_changed_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
Eo *editor = data;
printf("Change recorded: %s\n", efl_text_get(editor));
}
static void
_gui_about_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
{
@ -40,6 +47,8 @@ _gui_setup()
efl_ui_text_interactive_editable_set(efl_added, EINA_TRUE),
efl_ui_text_scrollable_set(efl_added, EINA_TRUE),
efl_pack(box, efl_added));
efl_event_callback_add(editor, EFL_UI_TEXT_EVENT_CHANGED_USER,
_gui_editor_changed_cb, editor);
hbox = efl_add(EFL_UI_BOX_CLASS, box,
efl_ui_direction_set(efl_added, EFL_UI_DIR_HORIZONTAL),

15
c-lib/meson.build
View File

@ -6,16 +6,6 @@ project(
add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
config_h = configuration_data()
config_h.set_quoted('PACKAGE', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('PACKAGE_BUILD_DIR', meson.build_root())
config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
@ -23,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
configure_file(
output : 'config.h',
install : false,
configuration: config_h
)

3
c-lib/src/lib/Example.h
View File

@ -1,6 +1,9 @@
#ifndef EXAMPLE_H_
# define EXAMPLE_H_
#define EFL_EO_API_SUPPORT 1
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#ifdef EAPI

4
c-lib/src/lib/example.c
View File

@ -1,7 +1,3 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "Example.h"
EAPI Eina_Bool example_method()

1
c-lib/src/test/meson.build
View File

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

5
c-lib/src/test/runner.c
View File

@ -1,6 +1,5 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#define EFL_EO_API_SUPPORT 1
#define EFL_BETA_API_SUPPORT 1
#include <check.h>
#include <Elementary.h>

4
c-lib/src/test/test_lib.c
View File

@ -1,7 +1,3 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include "suite.h"
START_TEST (lib_test_basic_call)

14
c-lifecycle/meson.build
View File

@ -6,15 +6,6 @@ project(
add_global_arguments('-DHAVE_CONFIG_H=1', '-DHAVE_CONFIG=1', language: 'c')
config_h = configuration_data()
config_h.set_quoted('PACKAGE', meson.project_name())
config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h.set_quoted('PACKAGE_STRING', meson.project_name() + ' ' + meson.project_version())
config_h.set_quoted('PACKAGE_NAME', meson.project_name())
config_h.set_quoted('EFL_EO_API_SUPPORT', '1')
config_h.set_quoted('EFL_BETA_API_SUPPORT', '1')
eina = dependency('eina', version : '>=1.20.99')
efl = dependency('efl', version : '>=1.20.99')
elm = dependency('elementary', version : '>=1.20.99')
@ -22,8 +13,3 @@ elm = dependency('elementary', version : '>=1.20.99')
inc = include_directories('.')
subdir('src')
configure_file(
output : 'config.h',
install : false,
configuration: config_h
)

5
c-lifecycle/src/lifecycle_main.c
View File

@ -1,6 +1,5 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#define EFL_EO_API_SUPPORT 1
#define EFL_BETA_API_SUPPORT 1
#include <Eina.h>
#include <Efl.h>