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

diff --git a/src/bin/edje/meson.build b/src/bin/edje/meson.build
index 9269d33..2fedb2c 100644 (file)
--- a/src/bin/edje/meson.build
+++ b/src/bin/edje/meson.build
@@ -81,6 +81,15 @@ edje_codegen = executable('edje_codegen',
         c_args : package_c_args,
 )
 
+if meson.is_cross_build()
+  _edje_codegen = find_program('edje_codegen', native: true)
+  edje_codegen_path = _edje_codegen.path()
+  edje_codegen_exe = [_edje_codegen]
+else
+  env = find_program('env', native: true)
+  edje_codegen_exe = [env, 'EFL_RUN_IN_TREE=1', edje_codegen.full_path()]
+endif
+
 edje_pick = executable('edje_pick',
         'edje_pick.c',
         dependencies: [edje_bin_deps, eet, ecore, eio, ecore_evas],

diff --git a/src/examples/edje/meson.build b/src/examples/edje/meson.build
index fce9230..d73c83a 100644 (file)
--- a/src/examples/edje/meson.build
+++ b/src/examples/edje/meson.build
@@ -91,8 +91,7 @@ codegen = custom_target('edje_cc_codegen_edc',
 themes += custom_target('edje_codegen_codegen.edj',
             input : codegen,
             output : ['@BASENAME@_example_generated.c', '@BASENAME@_example_generated.h'],
-            command : ['/usr/bin/env', 'EFL_RUN_IN_TREE=1', edje_codegen.full_path(),
-                       '--prefix=codegen_example',  '@INPUT@',
+            command : edje_codegen_exe + [ '--prefix=codegen_example',  '@INPUT@',
                        'example_group', '@OUTPUT0@', '@OUTPUT1@'],
             depends : [edje_codegen, themes])