summaryrefslogtreecommitdiff
path: root/src/lib/evas/file/evas_module.c
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-10-29 12:54:55 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-10-29 12:54:56 -0400
commit28f630ba418719c36ea679541acc97c59cf5183c (patch)
tree72655186e86d5715a7679682df5a967ff8145246 /src/lib/evas/file/evas_module.c
parent795c37b2a49e089984ec5c266e732ed217449c93 (diff)
meson: redo evas building
Summary: before recent times we had to support static and shared building based on the options of the user, which forced us to complicate our build with the evas_goal hack. the evas_goal hack more or less was the idea of "faking" the evas build in the evas directory, finish all the .eo generation there, then build the modules and make all the static files ready. Then build everything in evas_goal. Now, that we just build everything the same always, we can simply build it in the evas way (removing the evas_goal hack FINALLY), as the same modules are build statically and shared. This also gives us the possibility to build the shared image loaders *again* the the modules directory, which unbreaks peoples build scripts who packaged loader files seperatly. Reviewers: zmike, raster, cedric, stefan_schmidt Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10548
Diffstat (limited to '')
-rw-r--r--src/lib/evas/file/evas_module.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index b651ad544a..a1e8b623af 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -599,27 +599,12 @@ 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 // special cases due to compleixty of meson build and 602 char subsystem[PATH_MAX];
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];
618 603
619 snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str); 604 snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str);
620 bs_mod_get(buffer, sizeof(buffer), subsystem, name); 605 bs_mod_get(buffer, sizeof(buffer), subsystem, name);
621 } 606 if (!evas_file_path_exists(buffer))
622 if (!evas_file_path_exists(buffer)) buffer[0] = '\0'; 607 buffer[0] = '\0';
623 } 608 }
624 } 609 }
625#endif 610#endif