fix amalgamation after lua2 changes.
BTW, if lua2 is the default, maybe we could remove the mess that is the first version? SVN serves as history as well. SVN revision: 50157
This commit is contained in:
parent
d97c0b0a9a
commit
dcced661a2
|
@ -122,6 +122,8 @@ void *alloca(size_t);
|
|||
#include <lauxlib.h>
|
||||
#include <lualib.h>
|
||||
|
||||
#ifndef LUA2
|
||||
|
||||
#define EDJE_LUA_GET 1
|
||||
#define EDJE_LUA_SET 2
|
||||
#define EDJE_LUA_FN 3
|
||||
|
@ -5712,3 +5714,5 @@ _edje_lua_shutdown()
|
|||
lua_close(Ledje);
|
||||
Ledje = NULL;
|
||||
}
|
||||
|
||||
#endif // not LUA2
|
||||
|
|
|
@ -93,7 +93,9 @@ edje_init(void)
|
|||
_edje_box_init();
|
||||
_edje_external_init();
|
||||
_edje_module_init();
|
||||
#ifndef LUA2
|
||||
_edje_lua_init();
|
||||
#endif
|
||||
_edje_message_init();
|
||||
|
||||
_edje_real_part_mp = eina_mempool_add("chained_mempool",
|
||||
|
@ -122,7 +124,9 @@ edje_init(void)
|
|||
_edje_real_part_state_mp = NULL;
|
||||
_edje_real_part_mp = NULL;
|
||||
_edje_message_shutdown();
|
||||
#ifndef LUA2
|
||||
_edje_lua_shutdown();
|
||||
#endif
|
||||
_edje_module_shutdown();
|
||||
_edje_external_shutdown();
|
||||
_edje_box_shutdown();
|
||||
|
@ -181,7 +185,9 @@ edje_shutdown(void)
|
|||
_edje_real_part_mp = NULL;
|
||||
|
||||
_edje_message_shutdown();
|
||||
#ifndef LUA2
|
||||
_edje_lua_shutdown();
|
||||
#endif
|
||||
_edje_module_shutdown();
|
||||
_edje_external_shutdown();
|
||||
_edje_box_shutdown();
|
||||
|
|
Loading…
Reference in New Issue