Changeset 6419 for code/branches/pickup3/src/orxonox/CMakeLists.txt

Timestamp:

Dec 25, 2009, 11:07:09 PM (16 years ago)

Author:

rgrieder

Message:

Merged pickup2 into pickup3.

Location:

code/branches/pickup3

Files:

• . (modified) (1 prop)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)

code/branches/pickup3/src/orxonox/CMakeLists.txt

@@ -47 +47 @@
 ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(overlays)
-ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(sound)
 ADD_SUBDIRECTORY(weaponsystem)
@@ -58 +57 @@
     MoodManager.h
     controllers/HumanController.h
-    pickup/BaseItem.h
-    pickup/PickupInventory.h
     sound/SoundManager.h
   DEFINE_SYMBOL