raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f8e027c3954beaef4c5302402fca4d7715b5cec5
commit f8e027c3954beaef4c5302402fca4d7715b5cec5 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Oct 5 20:00:38 2019 +0100 build - efl run in tree - make exception for image loaders/savers due to meson's insistence on naming even moudles libmodule.so, and our complexity of build as in the previous commits ... have a special case for in tree module loading for these. --- src/lib/evas/file/evas_module.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c index a1e8b623af..b651ad544a 100644 --- a/src/lib/evas/file/evas_module.c +++ b/src/lib/evas/file/evas_module.c @@ -599,12 +599,27 @@ evas_module_find_type(Evas_Module_Type type, const char *name) { if (run_in_tree == 1) { - char subsystem[PATH_MAX]; + // special cases due to compleixty of meson build and + // putting these in odd places in the tree - do special + // name lookups for build in tree module lookups + if (type == EVAS_MODULE_TYPE_IMAGE_LOADER) + { + snprintf(buffer, sizeof(buffer), + PACKAGE_BUILD_DIR"/src/lib/evas_goal/libshared_loader_%s"MOD_SUFFIX, name); + } + else if (type == EVAS_MODULE_TYPE_IMAGE_SAVER) + { + snprintf(buffer, sizeof(buffer), + PACKAGE_BUILD_DIR"/src/lib/evas_goal/libshared_saver_%s"MOD_SUFFIX, name); + } + else + { + char subsystem[PATH_MAX]; - snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str); - bs_mod_get(buffer, sizeof(buffer), subsystem, name); - if (!evas_file_path_exists(buffer)) - buffer[0] = '\0'; + snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str); + bs_mod_get(buffer, sizeof(buffer), subsystem, name); + } + if (!evas_file_path_exists(buffer)) buffer[0] = '\0'; } } #endif --
