diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-10-05 20:00:38 +0100 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-10-05 20:00:52 +0100 |
commit | f8e027c3954beaef4c5302402fca4d7715b5cec5 (patch) | |
tree | 0d4e1b58b13a8a6a79610e1a89c16bceca3738ee /src/lib/evas/file | |
parent | 0f3bbb51f42edf53b28176c916f8057e4db6acdf (diff) |
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.
Diffstat (limited to 'src/lib/evas/file')
-rw-r--r-- | src/lib/evas/file/evas_module.c | 25 |
1 files 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) | |||
599 | { | 599 | { |
600 | if (run_in_tree == 1) | 600 | if (run_in_tree == 1) |
601 | { | 601 | { |
602 | char subsystem[PATH_MAX]; | 602 | // special cases due to compleixty of meson build and |
603 | // putting these in odd places in the tree - do special | ||
604 | // name lookups for build in tree module lookups | ||
605 | if (type == EVAS_MODULE_TYPE_IMAGE_LOADER) | ||
606 | { | ||
607 | snprintf(buffer, sizeof(buffer), | ||
608 | PACKAGE_BUILD_DIR"/src/lib/evas_goal/libshared_loader_%s"MOD_SUFFIX, name); | ||
609 | } | ||
610 | else if (type == EVAS_MODULE_TYPE_IMAGE_SAVER) | ||
611 | { | ||
612 | snprintf(buffer, sizeof(buffer), | ||
613 | PACKAGE_BUILD_DIR"/src/lib/evas_goal/libshared_saver_%s"MOD_SUFFIX, name); | ||
614 | } | ||
615 | else | ||
616 | { | ||
617 | char subsystem[PATH_MAX]; | ||
603 | 618 | ||
604 | snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str); | 619 | snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str); |
605 | bs_mod_get(buffer, sizeof(buffer), subsystem, name); | 620 | bs_mod_get(buffer, sizeof(buffer), subsystem, name); |
606 | if (!evas_file_path_exists(buffer)) | 621 | } |
607 | buffer[0] = '\0'; | 622 | if (!evas_file_path_exists(buffer)) buffer[0] = '\0'; |
608 | } | 623 | } |
609 | } | 624 | } |
610 | #endif | 625 | #endif |