Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/Makefile.am

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/Makefile.am (modified) (6 diffs)

orxonox/branches/physics/src/Makefile.am

@@ -17 +17 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
 
 
@@ -30 +33 @@
                  command_node.cc \
                  keynames.cc \
-                 camera.cc \
+                 world_entities/camera.cc \
                  track_manager.cc \
                  track_node.cc \
-                 animation.cc \
-                 animation3d.cc \
-                 animation_player.cc \
+                 util/animation/animation.cc \
+                 util/animation/animation3d.cc \
+                 util/animation/animation_player.cc \
                  garbage_collector.cc \
                  story_entities/story_entity.cc \
@@ -69 +72 @@
                  lib/lang/base_object.cc \
                  lib/util/ini_parser.cc \
-                 lib/util/list.cc \
-                 lib/util/resource_manager.cc \
+                 util/common/list.cc \
+                 util/resource_manager.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
@@ -79 +82 @@
                  track_manager.h \
                  ability.h \
-                 camera.h \
+                 world_entities/camera.h \
                  keynames.h \
                  command_node.h \
@@ -85 +88 @@
                  track_manager.h \
                  track_node.h \
-                 animation.h \
-                 t_animation.h \
-                 animation3d.h \
-                 animation_player.h \
+                 util/animation/animation.h \
+                 util/animation/t_animation.h \
+                 util/animation/animation3d.h \
+                 util/animation/animation_player.h \
                  garbage_collector.h \
                  story_entities/story_entity.h \
@@ -125 +128 @@
                  lib/lang/base_entity.h \
                  lib/lang/base_object.h \
-                 lib/util/list.h \
-                 lib/util/list_template.h \
-                 lib/util/resource_manager.h \
+                 util/common/list.h \
+                 util/common/list_template.h \
+                 util/resource_manager.h \
                  lib/util/ini_parser.h \
                  lib/math/vector.h \