forked from enlightenment/enlightenment
wiz - remove e module src support as .libs dirs no longer exist
it wouldnt work anyway and i removed it for e modules themselbves already - now fix this for wizard too as it'd not work anyway.
This commit is contained in:
parent
17e375c5a7
commit
95328255b1
|
@ -64,16 +64,11 @@ e_modapi_init(E_Module *m)
|
||||||
Eina_List *files;
|
Eina_List *files;
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
char *file;
|
char *file;
|
||||||
const char *src_path;
|
|
||||||
|
|
||||||
wiz_module = m;
|
wiz_module = m;
|
||||||
wizard_init();
|
wizard_init();
|
||||||
|
|
||||||
src_path = getenv("E_MODULE_SRC_PATH");
|
snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
|
||||||
if (src_path)
|
|
||||||
snprintf(buf, sizeof(buf), "%s/.libs", e_module_dir_get(m));
|
|
||||||
else
|
|
||||||
snprintf(buf, sizeof(buf), "%s/%s", e_module_dir_get(m), MODULE_ARCH);
|
|
||||||
files = ecore_file_ls(buf);
|
files = ecore_file_ls(buf);
|
||||||
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
|
files = eina_list_sort(files, 0, (Eina_Compare_Cb)_cb_sort_files);
|
||||||
EINA_LIST_FREE(files, file)
|
EINA_LIST_FREE(files, file)
|
||||||
|
@ -82,11 +77,8 @@ e_modapi_init(E_Module *m)
|
||||||
{
|
{
|
||||||
void *handle;
|
void *handle;
|
||||||
|
|
||||||
if (src_path)
|
snprintf(buf, sizeof(buf), "%s/%s/%s",
|
||||||
snprintf(buf, sizeof(buf), "%s/.libs/%s", e_module_dir_get(m), file);
|
e_module_dir_get(m), MODULE_ARCH, file);
|
||||||
else
|
|
||||||
snprintf(buf, sizeof(buf), "%s/%s/%s",
|
|
||||||
e_module_dir_get(m), MODULE_ARCH, file);
|
|
||||||
handle = dlopen(buf, RTLD_NOW | RTLD_LOCAL);
|
handle = dlopen(buf, RTLD_NOW | RTLD_LOCAL);
|
||||||
if (handle)
|
if (handle)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue