Changeset 2509 for code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/ceguilua-0.6.1/ceguilua/CEGUILua.cpp (modified) (4 diffs)
• src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp (modified) (1 diff)
• src/ceguilua-0.6.1/ceguilua/CMakeLists.txt (modified) (2 diffs)
• src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp (modified) (1 diff)

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

@@ -28 +28 @@
  *   OTHER DEALINGS IN THE SOFTWARE.
  ***************************************************************************/
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
 
 #include "CEGUI.h"
@@ -37 +40 @@
 
 // include Lua libs and tolua++
-#include "lua/lua.hpp"
-#include "tolua/tolua++.h"
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}
+
+#include "tolua++.h"
 
 // prototype for bindings initialisation function
@@ -53 +61 @@
 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}
-    };
+    #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 /* CEGUI_LUA_VER >= 51 */
 
     // create a lua state
@@ -72 +82 @@
 
     // 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);
-    }
+    #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 /* CEGUI_LUA_VER >= 51 */
+        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 /* CEGUI_LUA_VER >= 51 */
 
     setModuleIdentifierString();

code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CEGUILuaFunctor.cpp

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

code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(.)
-
 SET( CEGUILUA_SRC_FILES
   CEGUILua.cpp
@@ -11 +9 @@
 
 TARGET_LINK_LIBRARIES(ceguilua_orxonox
-  lua_orxonox
   tolualib_orxonox
-  ${CEGUI_LIBRARIES}
+  ${LUA_LIBRARIES}
+  ${CEGUI_LIBRARY}
 )

code/branches/buildsystem2/src/ceguilua-0.6.1/ceguilua/lua_CEGUI.cpp

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