Changeset 2608 for code/branches/buildsystem2/src/ceguilua/ceguilua-0.5.0/ceguilua/CEGUILua.cpp

Timestamp:

Jan 29, 2009, 8:13:22 PM (15 years ago)

Author:

rgrieder

Message:

Large cleanup in CEGUILua:

• Removed the heavy 1.7MB bind files and added the small pkg files from the CEGUI source instead
• Those pkg files get copied version incrementally (starting with 0.5.0) to the binary dir. That saves a lot of files when having 4 different versions.
• Added support for CEGUI 0.6.0 and 0.6.2
• Added library info files
• CEGUILua 0.5.0 finally supports Lua 5.1 too That means all version support both Lua 5.0 and 5.1
• Added unified diffs with the changes to the CEGUILua source

Location:

code/branches/buildsystem2/src/ceguilua

Files:

• . (added)
• ceguilua-0.5.0 (moved) (moved from code/branches/buildsystem2/src/ceguilua-0.5.0)
• ceguilua-0.5.0/ceguilua/CEGUILua.cpp (modified) (3 diffs)

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

@@ -41 +41 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 // prototype for bindings initialisation function
@@ -56 +56 @@
 LuaScriptModule::LuaScriptModule()
 {
+    #if LUA_VERSION_NUM >= 501
+        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}
+        };
+    #endif /* LUA_VERSION_NUM >= 501 */
+
         // create a lua state
         d_ownsState = true;
@@ -61 +77 @@
 
         // 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
+    #if LUA_VERSION_NUM >= 501
+            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);
+            }
+    #else /* LUA_VERSION_NUM >= 501 */
+            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
+    #endif /* LUA_VERSION_NUM >= 501 */
 
         setModuleIdentifierString();