Changeset 1959 for code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

Timestamp:

Oct 19, 2008, 11:46:37 PM (16 years ago)

Author:

rgrieder

Message:

Merged script_trigger branch into objecthierarchy branch.
Also merged changes in Script.cc and Script.h manually to LuaBind.cc and LuaBind.h.

Location:

code/branches/objecthierarchy

Files:

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

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

@@ -54 +54 @@
   objects/Tickable.cc
   objects/Test.cc
+  objects/Script.cc
+  objects/Trigger.cc
+  objects/DistanceTrigger.cc
 
   objects/infos/Info.cc
@@ -74 +77 @@
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/lib
 )
-        
+
+
 ADD_EXECUTABLE( orxonox ${ORXONOX_SRC_FILES} )