Changeset 1807

Timestamp:

Sep 21, 2008, 7:13:06 PM (16 years ago)

Author:

rgrieder

Message:

modification to ceguilua 0.5 in order to work with lua 5.1.3

Location:

code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua

Files:

• CEGUILua.cpp (modified) (2 diffs)
• CEGUILuaFunctor.cpp (modified) (1 diff)
• lua_CEGUI.cpp (modified) (1 diff)

code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp

@@ -35 +35 @@
 
 // include Lua libs and tolua++
-extern "C" {
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-}
+#include "lua/lua.hpp"
+#include "tolua/tolua++.h"
 
 #include "tolua++.h"
@@ -56 +53 @@
 LuaScriptModule::LuaScriptModule()
 {
-        // create a lua state
-        d_ownsState = true;
-        d_state = lua_open();
-
-        // init all standard libraries
-        luaopen_base(d_state);
-        luaopen_io(d_state);
-        luaopen_string(d_state);
-        luaopen_table(d_state);
-        luaopen_math(d_state);
-#if defined(DEBUG) || defined (_DEBUG)
-        luaopen_debug(d_state);
-#endif
-
-        setModuleIdentifierString();
+    static const luaL_Reg lualibs[] = {
+        {"", luaopen_base},
+        {LUA_LOADLIBNAME, luaopen_package},
+        {LUA_TABLIBNAME, luaopen_table},
+        {LUA_IOLIBNAME, luaopen_io},
+        {LUA_OSLIBNAME, luaopen_os},
+        {LUA_STRLIBNAME, luaopen_string},
+        {LUA_MATHLIBNAME, luaopen_math},
+    #if defined(DEBUG) || defined (_DEBUG)
+        {LUA_DBLIBNAME, luaopen_debug},
+    #endif
+        {0, 0}
+    };
+
+    // create a lua state
+    d_ownsState = true;
+    d_state = lua_open();
+
+    // init all standard libraries
+    const luaL_Reg *lib = lualibs;
+    for (; lib->func; lib++)
+    {
+        lua_pushcfunction(d_state, lib->func);
+        lua_pushstring(d_state, lib->name);
+        lua_call(d_state, 1, 0);
+    }
+
+    setModuleIdentifierString();
 }
 

code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua/CEGUILuaFunctor.cpp

@@ -34 +34 @@
 
 // include Lua libs and tolua++
-extern "C" {
-#include "lua.h"
-#include "lualib.h"
-#include "lauxlib.h"
-}
-
-#include "tolua++.h"
+#include "lua/lua.hpp"
+#include "tolua/tolua++.h"
 
 // Start of CEGUI namespace section

code/branches/ceguilua/src/ceguilua-0.5.0b/ceguilua/lua_CEGUI.cpp

@@ -9 +9 @@
 #include "string.h"
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 /* Exported function */