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

Timestamp:

May 22, 2005, 12:41:07 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: moved around some files, and deleted the obsolete DataTank

File:

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

orxonox/trunk/src/Makefile.am

@@ -24 +24 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
 
@@ -42 +43 @@
 
 orxonox_SOURCES= orxonox.cc \
-                 game_loader.cc \
+                 defs/keynames.cc \
                  command_node.cc \
-                 keynames.cc \
-                 world_entities/camera.cc \
-                 track_manager.cc \
-                 track_node.cc \
+                 util/loading/game_loader.cc \
+                 util/track/track_manager.cc \
+                 util/track/track_node.cc \
                  util/animation/animation.cc \
                  util/animation/animation3d.cc \
                  util/animation/animation_player.cc \
                  util/object_manager.cc \
-                 garbage_collector.cc \
+                 util/garbage_collector.cc \
+                 util/common/list.cc \
+                 util/resource_manager.cc \
+                 util/loading/factory.cc \
+                 util/loading/load_param.cc \
                  story_entities/story_entity.cc \
                  story_entities/campaign.cc \
                  story_entities/world.cc \
                  world_entities/world_entity.cc \
+                 world_entities/camera.cc \
                  world_entities/player.cc \
                  world_entities/environment.cc \
@@ -69 +74 @@
                  world_entities/test_bullet.cc \
                  world_entities/test_entity.cc \
-                 ai/ai.cc \
                  lib/coord/p_node.cc \
                  lib/coord/null_parent.cc \
                  lib/coord/helper_parent.cc \
-                 lib/data/data_tank.cc \
                  lib/graphics/graphics_engine.cc \
                  lib/graphics/light.cc \
@@ -91 +94 @@
                  lib/util/ini_parser.cc \
                  lib/util/substring.cc \
-                 util/common/list.cc \
-                 util/resource_manager.cc \
-                 util/loading/factory.cc \
-                 util/loading/load_param.cc \
                  lib/math/vector.cc \
                  lib/math/curve.cc \
@@ -101 +100 @@
 
 noinst_HEADERS = orxonox.h \
-                 game_loader.h \
-                 track_manager.h \
                  ability.h \
-                 world_entities/camera.h \
-                 keynames.h \
+                 defs/keynames.h \
                  command_node.h \
-                 message_structures.h \
-                 track_manager.h \
-                 track_node.h \
+                 defs/message_structures.h \
+                 util/loading/game_loader.h \
+                 util/track/track_manager.h \
+                 util/track/track_node.h \
                  util/animation/animation.h \
                  util/animation/t_animation.h \
@@ -115 +112 @@
                  util/animation/animation_player.h \
                  util/object_manager.h \
-                 garbage_collector.h \
+                 util/garbage_collector.h \
                  story_entities/story_entity.h \
                  story_entities/story_def.h \
@@ -121 +118 @@
                  story_entities/world.h \
                  world_entities/world_entity.h \
+                 world_entities/camera.h \
                  world_entities/player.h \
                  world_entities/npc.h \
@@ -161 +159 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
-                 lib/data/data_tank.h \
                  lib/lang/base_entity.h \
                  lib/lang/base_object.h \