Changeset 2671

Timestamp:

Feb 15, 2009, 11:00:13 PM (16 years ago)

Author:

rgrieder

Message:

Fixed build:

• Two inline functions without inline body in Synchronisable.h
• objects/items somehow didn't make it through the merge

Location:

code/branches/buildsystem3/src

Files:

• network/synchronisable/Synchronisable.h (modified) (1 diff)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)

code/branches/buildsystem3/src/network/synchronisable/Synchronisable.h

@@ -153 +153 @@
     uint32_t getSize(int32_t id, uint8_t mode=0x0);
     bool updateData(uint8_t*& mem, uint8_t mode=0x0, bool forceCallback=false);
-    inline bool isMyData(uint8_t* mem);
-    inline bool doSync(int32_t id, uint8_t mode=0x0);
+    bool isMyData(uint8_t* mem);
+    bool doSync(int32_t id, uint8_t mode=0x0);
 
     uint32_t objectID;

code/branches/buildsystem3/src/orxonox/objects/CMakeLists.txt

@@ -18 +18 @@
 ADD_SUBDIRECTORY(gametypes)
 ADD_SUBDIRECTORY(infos)
+ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(quest)