Changeset 1038 for code/trunk

Timestamp:

Apr 13, 2008, 2:59:01 PM (17 years ago)

Author:

landauf

Message:

compiles on tardis

Location:

code/trunk/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (1 diff)
• core/CMakeLists.txt (modified) (1 diff)
• core/Script.cc (modified) (1 diff)
• core/Script.h (modified) (1 diff)

code/trunk/src/orxonox/CMakeLists.txt

@@ -38 +38 @@
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
+  ${Lua_LIBRARIES}
   util
   core

code/trunk/src/orxonox/Orxonox.cc

@@ -435 +435 @@
 
     // Times up to frameSmoothingTime_ seconds old should be kept
-    unsigned long discardThreshold = (unsigned long)frameSmoothingTime_ * 1000.0f;
+    unsigned long discardThreshold = (unsigned long)(frameSmoothingTime_ * 1000.0f);
 
     // Find the oldest time to keep

code/trunk/src/orxonox/core/CMakeLists.txt

@@ -31 +31 @@
 TARGET_LINK_LIBRARIES( core
   util
-
   ${Lua_LIBRARIES}
   ${OIS_LIBRARIES}

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

@@ -109 +109 @@
     error = luaL_loadstring(luaState_, init.c_str());
 #else
-    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, init.c_str(), "init");
+    error = lua_load(luaState_, &orxonox::Script::lua_Chunkreader, (void*)init.c_str(), "init");
 #endif
     if (error == 0)

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

@@ -31 +31 @@
 
 #if LUA_VERSION_NUM != 501
-    inline const char * lua_Chunkreader(lua_State *L, void *data, size_t *size) { return NULL;};
+    inline static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size) { return NULL;};
 #endif