Changeset 3365 in orxonox.OLD for orxonox/trunk/src/Makefile.am

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

File:

• orxonox/trunk/src/Makefile.am (modified) (3 diffs)

orxonox/trunk/src/Makefile.am

@@ -24 +24 @@
                  story_entity.cc \
                  environment.cc \
-                 importer/object.cc \
+                 importer/model.cc \
                  importer/array.cc \
                  importer/material.cc \
+                 importer/texture.cc \
                  list.cc \
-                 p_node.cc
+                 p_node.cc \
+                 null_parent.cc \
+                 base_object.cc \
+                 helper_parent.cc \
+                 track_manager.cc \
+                 matrix.cc \
+                 curve.cc \
+                 glmenu_imagescreen.cc
+
 
 noinst_HEADERS = ability.h \
@@ -54 +63 @@
                  shoot_laser.h \
                  world_entity.h \
-                 coordinates.h \
                  message_structures.h \
                  shoot_rocket.h \
@@ -62 +70 @@
                  game_loader.h \
                  campaign.h \
-                 p_node.h
+                 p_node.h \
+                 null_parent.h \
+                 base_object.h \
+                 helper_parent.h \
+                 track_manager.h \
+                 matrix.h \
+                 curve.h \
+                 glmenu_imagescreen.h
+
 
 ## orxonox.conf will be used from home-dir instead.