Changeset 1804 for code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua
- Timestamp:
- Sep 21, 2008, 5:10:08 PM (16 years ago)
- Location:
- code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/CEGUILua.cpp
r1803 r1804 28 28 * OTHER DEALINGS IN THE SOFTWARE. 29 29 ***************************************************************************/ 30 #ifdef HAVE_CONFIG_H31 # include "config.h"32 #endif33 30 34 31 #include "CEGUI.h" … … 40 37 41 38 // include Lua libs and tolua++ 42 extern "C" { 43 #include "lua.h" 44 #include "lualib.h" 45 #include "lauxlib.h" 46 } 47 48 #include "tolua++.h" 39 #include "lua/lua.hpp" 40 #include "tolua/tolua++.h" 49 41 50 42 // prototype for bindings initialisation function … … 61 53 LuaScriptModule::LuaScriptModule() 62 54 { 63 #if CEGUI_LUA_VER >= 51 64 static const luaL_Reg lualibs[] = { 65 {"", luaopen_base}, 66 {LUA_LOADLIBNAME, luaopen_package}, 67 {LUA_TABLIBNAME, luaopen_table}, 68 {LUA_IOLIBNAME, luaopen_io}, 69 {LUA_OSLIBNAME, luaopen_os}, 70 {LUA_STRLIBNAME, luaopen_string}, 71 {LUA_MATHLIBNAME, luaopen_math}, 72 #if defined(DEBUG) || defined (_DEBUG) 73 {LUA_DBLIBNAME, luaopen_debug}, 74 #endif 75 {0, 0} 76 }; 77 #endif /* CEGUI_LUA_VER >= 51 */ 55 static const luaL_Reg lualibs[] = { 56 {"", luaopen_base}, 57 {LUA_LOADLIBNAME, luaopen_package}, 58 {LUA_TABLIBNAME, luaopen_table}, 59 {LUA_IOLIBNAME, luaopen_io}, 60 {LUA_OSLIBNAME, luaopen_os}, 61 {LUA_STRLIBNAME, luaopen_string}, 62 {LUA_MATHLIBNAME, luaopen_math}, 63 #if defined(DEBUG) || defined (_DEBUG) 64 {LUA_DBLIBNAME, luaopen_debug}, 65 #endif 66 {0, 0} 67 }; 78 68 79 69 // create a lua state … … 82 72 83 73 // init all standard libraries 84 #if CEGUI_LUA_VER >= 51 85 const luaL_Reg *lib = lualibs; 86 for (; lib->func; lib++) 87 { 88 lua_pushcfunction(d_state, lib->func); 89 lua_pushstring(d_state, lib->name); 90 lua_call(d_state, 1, 0); 91 } 92 #else /* CEGUI_LUA_VER >= 51 */ 93 luaopen_base(d_state); 94 luaopen_io(d_state); 95 luaopen_string(d_state); 96 luaopen_table(d_state); 97 luaopen_math(d_state); 98 #if defined(DEBUG) || defined (_DEBUG) 99 luaopen_debug(d_state); 100 #endif 101 #endif /* CEGUI_LUA_VER >= 51 */ 74 const luaL_Reg *lib = lualibs; 75 for (; lib->func; lib++) 76 { 77 lua_pushcfunction(d_state, lib->func); 78 lua_pushstring(d_state, lib->name); 79 lua_call(d_state, 1, 0); 80 } 102 81 103 82 setModuleIdentifierString(); -
code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp
r1803 r1804 34 34 35 35 // include Lua libs and tolua++ 36 extern "C" { 37 #include "lua.h" 38 #include "lualib.h" 39 #include "lauxlib.h" 40 } 41 42 #include "tolua++.h" 36 #include "lua/lua.hpp" 37 #include "tolua/tolua++.h" 43 38 44 39 // Start of CEGUI namespace section -
code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt
r1803 r1804 9 9 10 10 ADD_LIBRARY( ceguilua_orxonox SHARED ${LUA_SRC_FILES} ) 11 12 TARGET_LINK_LIBRARIES( ceguilua_orxonox lua_orxonox ) -
code/branches/ceguilua/src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp
r1803 r1804 9 9 #include "string.h" 10 10 11 #include "tolua ++.h"11 #include "tolua/tolua++.h" 12 12 13 13 /* Exported function */
Note: See TracChangeset
for help on using the changeset viewer.