Changeset 954 for code/branches/script/src/orxonox

Timestamp:

Mar 29, 2008, 5:20:08 PM (17 years ago)

Author:

bknecht

Message:

lua linking works now (v 5.1 and 5.0). not tested on tardis and will not work on windows

Location:

code/branches/script/src/orxonox/script

Files:

• Script.cc (modified) (2 diffs)
• Script.h (modified) (1 diff)

code/branches/script/src/orxonox/script/Script.cc

@@ -27 +27 @@
 
 #include "Script.h"
-//#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
+extern "C" {
+#include "lualib.h"
+#include "lauxlib.h"
+}
 
 
@@ -37 +38 @@
   {
     state_ = lua_open();
-
+#if Lua_VERSION == 51
     luaL_openlibs(state_);
+#else
+    luaopen_base(state_);
+    luaopen_table(state_);
+    luaopen_io(state_);
+    luaopen_string(state_);
+    luaopen_math(state_);
+    luaopen_debug(state_);
+#endif
   }
 

code/branches/script/src/orxonox/script/Script.h

@@ -8 +8 @@
 #define _Script_H__
 
-#include <lua.h>
+extern "C" {
+#include "lua.h"
+}
 
 namespace orxonox