forked from enlightenment/efl
parent
eaa190ad0e
commit
114d49883d
|
@ -553,6 +553,7 @@ _elua_table_ptr_get(lua_State *L, const void *key)
|
||||||
return ptr;
|
return ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* XXX: not used
|
||||||
static void
|
static void
|
||||||
_elua_table_ptr_del(lua_State *L, const void *key)
|
_elua_table_ptr_del(lua_State *L, const void *key)
|
||||||
{
|
{
|
||||||
|
@ -560,6 +561,7 @@ _elua_table_ptr_del(lua_State *L, const void *key)
|
||||||
lua_pushnil(L);
|
lua_pushnil(L);
|
||||||
lua_settable(L, LUA_REGISTRYINDEX);
|
lua_settable(L, LUA_REGISTRYINDEX);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_elua_gc(lua_State *L)
|
_elua_gc(lua_State *L)
|
||||||
|
@ -1388,6 +1390,7 @@ _elua_2_int_get(lua_State *L, int i, Eina_Bool tr,
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* XXX: not used
|
||||||
static int
|
static int
|
||||||
_elua_3_int_get(lua_State *L, int i, Eina_Bool tr,
|
_elua_3_int_get(lua_State *L, int i, Eina_Bool tr,
|
||||||
const char *n1, int *v1,
|
const char *n1, int *v1,
|
||||||
|
@ -1436,6 +1439,7 @@ _elua_3_int_get(lua_State *L, int i, Eina_Bool tr,
|
||||||
}
|
}
|
||||||
return n;
|
return n;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_elua_4_int_get(lua_State *L, int i, Eina_Bool tr,
|
_elua_4_int_get(lua_State *L, int i, Eina_Bool tr,
|
||||||
|
|
|
@ -41,6 +41,7 @@ Eina_List *_modules_found = NULL;
|
||||||
|
|
||||||
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
#if defined(__CEGCC__) || defined(__MINGW32CE__)
|
||||||
# define EDJE_MODULE_NAME "edje_%s.dll"
|
# define EDJE_MODULE_NAME "edje_%s.dll"
|
||||||
|
# define EDJE_EXTRA_MODULE_NAME 1
|
||||||
#elif _WIN32
|
#elif _WIN32
|
||||||
# define EDJE_MODULE_NAME "module.dll"
|
# define EDJE_MODULE_NAME "module.dll"
|
||||||
#else
|
#else
|
||||||
|
@ -63,8 +64,11 @@ edje_module_load(const char *module)
|
||||||
Eina_Module *em;
|
Eina_Module *em;
|
||||||
char tmp[PATH_MAX];
|
char tmp[PATH_MAX];
|
||||||
|
|
||||||
/* A warning is expected has the naming change under wince. */
|
snprintf(tmp, sizeof (tmp), "%s/%s/%s/" EDJE_MODULE_NAME, path, module, MODULE_ARCH
|
||||||
snprintf(tmp, sizeof (tmp), "%s/%s/%s/" EDJE_MODULE_NAME, path, module, MODULE_ARCH, module);
|
#ifdef EDJE_EXTRA_MODULE_NAME
|
||||||
|
, module
|
||||||
|
#endif
|
||||||
|
);
|
||||||
em = eina_module_new(tmp);
|
em = eina_module_new(tmp);
|
||||||
if (!em) continue ;
|
if (!em) continue ;
|
||||||
|
|
||||||
|
@ -158,8 +162,11 @@ edje_available_modules_get(void)
|
||||||
{
|
{
|
||||||
char tmp[PATH_MAX];
|
char tmp[PATH_MAX];
|
||||||
|
|
||||||
/* A warning is expected has the naming change under wince. */
|
snprintf(tmp, sizeof (tmp), "%s/%s/" EDJE_MODULE_NAME, info->path, MODULE_ARCH
|
||||||
snprintf(tmp, sizeof (tmp), "%s/%s/" EDJE_MODULE_NAME, info->path, MODULE_ARCH, ecore_file_file_get(info->path));
|
#ifdef EDJE_EXTRA_MODULE_NAME
|
||||||
|
, ecore_file_file_get(info->path)
|
||||||
|
#endif
|
||||||
|
);
|
||||||
|
|
||||||
if (ecore_file_exists(tmp))
|
if (ecore_file_exists(tmp))
|
||||||
result = eina_list_append(result, eina_stringshare_add(ecore_file_file_get(info->path)));
|
result = eina_list_append(result, eina_stringshare_add(ecore_file_file_get(info->path)));
|
||||||
|
|
Loading…
Reference in New Issue