p96705831
/
efl
forked from openkylin/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

Gbp-Pq: Name 0006-build-efl-run-in-tree-make-exception-for-image-loade.patch
This commit is contained in:
Carsten Haitzler (Rasterman) 2019-10-05 20:00:38 +01:00 committed by luoyaoming
parent c4863cf367
commit 5dc793c6d0
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/evas/file/evas_module.c
View File

@ -599,12 +599,27 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
{ {
if (run_in_tree == 1) 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); snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str);
bs_mod_get(buffer, sizeof(buffer), subsystem, name); bs_mod_get(buffer, sizeof(buffer), subsystem, name);
if (!evas_file_path_exists(buffer)) }
buffer[0] = '\0'; if (!evas_file_path_exists(buffer)) buffer[0] = '\0';
} }
} }
#endif #endif