source: code/trunk/src/external/ceguilua/ceguilua-0.5.0/ceguilua/changes_orxonox.diff @ 5738

CEGUILua.cpp

@@ -40 +40 @@
 #include "lauxlib.h"
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 // prototype for bindings initialisation function
 int tolua_CEGUI_open(lua_State* tolua_S);
@@ -55 +55 @@
 *************************************************************************/
 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;
         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
+    #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();
 }

CEGUILua.h

@@ -38 +38 @@
 #   ifdef CEGUILUA_EXPORTS
 #       define CEGUILUA_API __declspec(dllexport)
 #   else
-#       define CEGUILUA_API __declspec(dllimport)
+#       if defined( __MINGW32__ )
+#           define CEGUILUA_API
+#       else
+#           define CEGUILUA_API __declspec(dllimport)
+#       endif
 #   endif
 #else
 #   define CEGUILUA_API

CEGUILuaFunctor.cpp

@@ -39 +39 @@
 #include "lauxlib.h"
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 
 // Start of CEGUI namespace section
 namespace CEGUI

required.h

@@ -36 +36 @@
 #define __operator_decrement    operator--
 #define __operator_dereference  operator*
 
+//This is used to keep compilers happy
+#define CEGUIDeadException(e) &
+
 #define LuaFunctorSubscribeEvent CEGUI::LuaFunctor::SubscribeEvent
 
 #if defined(_MSC_VER) && !defined(snprintf)