Changeset 1980 for code/branches/buildsystem/src/ceguilua-0.5.0/ceguilua/CEGUILua.cpp

Timestamp:

Oct 20, 2008, 5:53:54 PM (17 years ago)

Author:

adrfried

Message:

using ceguilua-0.5.0

Location:

code/branches/buildsystem/src/ceguilua-0.5.0

Files:

• . (added)
• ceguilua (added)
• ceguilua/CEGUILua.cpp (moved) (moved from code/branches/buildsystem/src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp) (2 diffs)

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

@@ -35 +35 @@
 
 // include Lua libs and tolua++
-#include "lua.hpp"
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
+
 #include "tolua++.h"
 
@@ -51 +56 @@
 LuaScriptModule::LuaScriptModule()
 {
-    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();
+        // 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();
 }