forked from enlightenment/efl
efl/emotion: postpone finding modules as well.
SVN revision: 82680
This commit is contained in:
parent
d8db6705ad
commit
8e9303e1a4
|
@ -50,11 +50,14 @@ _emotion_engine_registry_entry_cmp(const void *pa, const void *pb)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_emotion_modules_find(void)
|
_emotion_modules_load(void)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX];
|
char buf[PATH_MAX];
|
||||||
char *path;
|
char *path;
|
||||||
|
|
||||||
|
if (_emotion_modules_loaded) return;
|
||||||
|
_emotion_modules_loaded = EINA_TRUE;
|
||||||
|
|
||||||
if (getenv("EFL_RUN_IN_TREE"))
|
if (getenv("EFL_RUN_IN_TREE"))
|
||||||
{
|
{
|
||||||
struct stat st;
|
struct stat st;
|
||||||
|
@ -81,7 +84,7 @@ _emotion_modules_find(void)
|
||||||
EINA_FALSE, NULL, NULL);
|
EINA_FALSE, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
goto load;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -102,14 +105,8 @@ _emotion_modules_find(void)
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s/emotion/modules", eina_prefix_lib_get(_emotion_pfx));
|
snprintf(buf, sizeof(buf), "%s/emotion/modules", eina_prefix_lib_get(_emotion_pfx));
|
||||||
_emotion_modules = eina_module_arch_list_get(_emotion_modules, buf, MODULE_ARCH);
|
_emotion_modules = eina_module_arch_list_get(_emotion_modules, buf, MODULE_ARCH);
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_emotion_modules_load(void)
|
|
||||||
{
|
|
||||||
if (_emotion_modules_loaded) return;
|
|
||||||
_emotion_modules_loaded = EINA_TRUE;
|
|
||||||
|
|
||||||
|
load:
|
||||||
if (_emotion_modules)
|
if (_emotion_modules)
|
||||||
eina_module_list_load(_emotion_modules);
|
eina_module_list_load(_emotion_modules);
|
||||||
|
|
||||||
|
@ -120,24 +117,16 @@ _emotion_modules_load(void)
|
||||||
Eina_Bool
|
Eina_Bool
|
||||||
emotion_modules_init(void)
|
emotion_modules_init(void)
|
||||||
{
|
{
|
||||||
int static_modules = 0;
|
|
||||||
|
|
||||||
_emotion_modules_find();
|
|
||||||
|
|
||||||
/* Init static module */
|
|
||||||
#ifdef EMOTION_STATIC_BUILD_XINE
|
#ifdef EMOTION_STATIC_BUILD_XINE
|
||||||
static_modules += xine_module_init();
|
xine_module_init();
|
||||||
#endif
|
#endif
|
||||||
#ifdef EMOTION_STATIC_BUILD_GSTREAMER
|
#ifdef EMOTION_STATIC_BUILD_GSTREAMER
|
||||||
static_modules += gstreamer_module_init();
|
gstreamer_module_init();
|
||||||
#endif
|
#endif
|
||||||
#ifdef EMOTION_STATIC_BUILD_GENERIC
|
#ifdef EMOTION_STATIC_BUILD_GENERIC
|
||||||
static_modules += generic_module_init();
|
generic_module_init();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((!_emotion_modules) && (!static_modules))
|
|
||||||
WRN("No emotion modules found!");
|
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue