Changeset 1029

Timestamp:

Apr 11, 2008, 7:01:02 PM (16 years ago)

Author:

bknecht

Message:

some changes

Location:

code/trunk

Files:

• cmake/FindLua.cmake (modified) (1 diff)
• src/orxonox/core/Script.cc (modified) (3 diffs)
• src/orxonox/core/Script.h (modified) (1 diff)

code/trunk/cmake/FindLua.cmake

@@ -27 +27 @@
         /usr/include/lua50
         /usr/local/include/lua50
-        /usr/pack/lua-5.0.3-sd/include/)
+        /usr/pack/lua-5.0.3-sd/include)
 ENDIF (NOT Lua_INCLUDE_DIR)
-MESSAGE(STATUS ${Lua_INCLUDE_DIR})
 
 IF (NOT Lua_LIBRARIES)
-FIND_LIBRARY(Lua_LIBRARIES lua50 lua
+FIND_LIBRARY(Lua_LIBRARIES lua50
         /usr/lib
-        /usr/local/lib
-        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/)
+        /usr/local/lib)
 
-FIND_LIBRARY(Lua_LIBRARY lualib50 lualib
+FIND_LIBRARY(Lua_LIBRARY lualib50
         /usr/lib
-        /usr/local/lib
-        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib/)
+        /usr/local/lib)
 
-MESSAGE(STATUS ${Lua_LIBRARY})
-MESSAGE(STATUS ${Lua_LIBRARIES})
+SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})
+
+ENDIF (NOT Lua_LIBRARIES)
+
+IF (NOT Lua_LIBRARIES)
+FIND_LIBRARY(Lua_LIBRARIES lua
+        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib)
+
+FIND_LIBRARY(Lua_LIBRARY lualib
+        /usr/pack/lua-5.0.3-sd/i686-debian-linux3.1/lib)
 
 SET(Lua_LIBRARIES ${Lua_LIBRARIES} ${Lua_LIBRARY})

code/trunk/src/orxonox/core/Script.cc

@@ -49 +49 @@
     luaState_ = lua_open();
     luaSource_ = "";
+#if LUA_VERSION_NUM == 501
     luaL_openlibs(luaState_);
+#else
+    luaopen_base(luaState_);
+    luaopen_string(luaState_);
+    luaopen_table(luaState_);
+    luaopen_math(luaState_);
+    luaopen_io(luaState_);
+    luaopen_debug(luaState_);
+#endif
     tolua_orxonox_open(luaState_);
     output_;
@@ -97 +106 @@
     std::string init = "local scr = orxonox.Script:getInstance()\nprint = function(s)\nscr:luaPrint(s)\nend\n";
     init += luaSource_;
+#if LUA_VERSION_NUM == 501
     error = luaL_loadstring(luaState_, init.c_str());
+#else
+    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, init.c_str(), "init");
+#endif
     if (error == 0)
       error = lua_pcall(luaState_, 0, 0, 0);
     if (error != 0) COUT(2) << "Error in Lua-script: " << lua_tostring(luaState_, -1) << std::endl;
   }
-
 
   unsigned int Script::getNextQuote(const std::string& text, unsigned int start)
@@ -143 +155 @@
       std::map<unsigned int, bool>::iterator it2 = it;
       bool bBetweenQuotes = false;
-      bool bBetweenTags = false;
       unsigned int pos = 0;
       while ((pos = getNextQuote(text, pos)) != std::string::npos)

code/trunk/src/orxonox/core/Script.h

@@ -30 +30 @@
     void luaPrint(std::string str); // tolua_export
 
+#if LUA_VERSION_NUM != 501
+    inline const char * lua_Chunkreader(lua_State *L, void *data, size_t *size) { return NULL;};
+#endif
+
     inline lua_State* getLuaState() { return luaState_; };
     inline std::string getLuaOutput() { return output_; };