ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/examples.git/commit/?id=4709a4d366e4c9355659d3f5d76b8034b919fec8
commit 4709a4d366e4c9355659d3f5d76b8034b919fec8 Author: Andy Williams <[email protected]> Date: Fri Nov 17 11:18:39 2017 +0000 build: Assume latest eolian which knows system locations --- tutorial/c/eo-classes/meson.build | 2 +- tutorial/c/eo-classes/src/meson.build | 3 +-- tutorial/c/eo-inherit/meson.build | 2 +- tutorial/c/eo-inherit/src/meson.build | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tutorial/c/eo-classes/meson.build b/tutorial/c/eo-classes/meson.build index aee782b..0707020 100644 --- a/tutorial/c/eo-classes/meson.build +++ b/tutorial/c/eo-classes/meson.build @@ -6,7 +6,7 @@ project( eina = dependency('eina', version : '>=1.20.99') efl = dependency('efl-core', version : '>=1.20.99') -eolian = dependency('eolian', version : '>=1.20.99') +dependency('eolian', version : '>=1.20.99') inc = include_directories('.') subdir('src') diff --git a/tutorial/c/eo-classes/src/meson.build b/tutorial/c/eo-classes/src/meson.build index 831f11c..0fcb919 100644 --- a/tutorial/c/eo-classes/src/meson.build +++ b/tutorial/c/eo-classes/src/meson.build @@ -11,8 +11,7 @@ foreach eo : eo_src eo_gen += custom_target('eolian_gen_' + eo_file, input : eo_file, output : [eo_file + '.h'], - command : [eolian_gen, '-I', eolian.get_pkgconfig_variable('eoincludedir'), - '-I', meson.current_source_dir(), + command : [eolian_gen, '-I', meson.current_source_dir(), '-gchi', '-o', 'i:' + join_paths(meson.current_source_dir(), eo + '.c'), '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), diff --git a/tutorial/c/eo-inherit/meson.build b/tutorial/c/eo-inherit/meson.build index 55cdb94..c24dcb1 100644 --- a/tutorial/c/eo-inherit/meson.build +++ b/tutorial/c/eo-inherit/meson.build @@ -6,7 +6,7 @@ project( eina = dependency('eina', version : '>=1.20.99') efl = dependency('efl-core', version : '>=1.20.99') -eolian = dependency('eolian', version : '>=1.20.99') +dependency('eolian', version : '>=1.20.99') inc = include_directories('.') subdir('src') diff --git a/tutorial/c/eo-inherit/src/meson.build b/tutorial/c/eo-inherit/src/meson.build index ec92317..4334c40 100644 --- a/tutorial/c/eo-inherit/src/meson.build +++ b/tutorial/c/eo-inherit/src/meson.build @@ -11,8 +11,7 @@ foreach eo : eo_src eo_gen += custom_target('eolian_gen_' + eo_file, input : eo_file, output : [eo_file + '.h'], - command : [eolian_gen, '-I', eolian.get_pkgconfig_variable('eoincludedir'), - '-I', meson.current_source_dir(), + command : [eolian_gen, '-I', meson.current_source_dir(), '-gchi', '-o', 'i:' + join_paths(meson.current_source_dir(), eo + '.c'), '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'), --
