summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-02-15 10:55:38 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2019-02-27 11:31:46 +0100
commit300b1993d830eaab0bcd85774c22759bf3cb4864 (patch)
treeb51416545c9224440141a2e1178ab66cf7f122f3
parent25470a56d371b12877b461f4af06a86d2022a05a (diff)
meson: edje: setup edje_codegen for cross-builds as well
We had it all setup for edje_cc, but missed edje_codegen which is used in the examples. Reviewed-by: Marcel Hollerbach <marcel-hollerbach@t-online.de> Differential Revision: https://phab.enlightenment.org/D7963
-rw-r--r--src/bin/edje/meson.build9
-rw-r--r--src/examples/edje/meson.build3
2 files changed, 10 insertions, 2 deletions
diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 9269d3338d..2fedb2cf4a 100644
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -81,6 +81,15 @@ edje_codegen = executable('edje_codegen',
81 c_args : package_c_args, 81 c_args : package_c_args,
82) 82)
83 83
84if meson.is_cross_build()
85 _edje_codegen = find_program('edje_codegen', native: true)
86 edje_codegen_path = _edje_codegen.path()
87 edje_codegen_exe = [_edje_codegen]
88else
89 env = find_program('env', native: true)
90 edje_codegen_exe = [env, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()]
91endif
92
84edje_pick = executable('edje_pick', 93edje_pick = executable('edje_pick',
85 'edje_pick.c', 94 'edje_pick.c',
86 dependencies: [edje_bin_deps, eet, ecore, eio, ecore_evas], 95 dependencies: [edje_bin_deps, eet, ecore, eio, ecore_evas],
diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index fce9230575..d73c83a199 100644
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -91,8 +91,7 @@ codegen = custom_target('edje_cc_codegen_edc',
91themes += custom_target('edje_codegen_codegen.edj', 91themes += custom_target('edje_codegen_codegen.edj',
92 input : codegen, 92 input : codegen,
93 output : ['@BASENAME@_example_generated.c', '@BASENAME@_example_generated.h'], 93 output : ['@BASENAME@_example_generated.c', '@BASENAME@_example_generated.h'],
94 command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_codegen.full_path(), 94 command : edje_codegen_exe + [ '--prefix=codegen_example', '@INPUT@',
95 '--prefix=codegen_example', '@INPUT@',
96 'example_group', '@OUTPUT0@', '@OUTPUT1@'], 95 'example_group', '@OUTPUT0@', '@OUTPUT1@'],
97 depends : [edje_codegen, themes]) 96 depends : [edje_codegen, themes])
98 97