Changeset 5558 in orxonox.OLD for branches/world_entities/src/util/Makefile.am

Timestamp:

Nov 13, 2005, 3:10:49 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/world_entities: merged the Trunk to the world_entities branche
merged with command
svn merge -r5516:HEAD ../trunk/ world_entities/
no conflicts

File:

• branches/world_entities/src/util/Makefile.am (modified) (3 diffs)

branches/world_entities/src/util/Makefile.am

@@ -5 +5 @@
 
 libORXutils_a_SOURCES = fast_factory.cc \
+                        loading/factory.cc \
                         garbage_collector.cc \
                         state.cc \
@@ -12 +13 @@
                         animation/animation_player.cc \
                         loading/resource_manager.cc \
-                        loading/factory.cc \
                         loading/game_loader.cc \
                         loading/load_param.cc \
+                        loading/load_param_description.cc \
                         track/pilot_node.cc \
                         track/track_manager.cc \
@@ -31 +32 @@
                         loading/game_loader.h \
                         loading/load_param.h \
+                        loading/load_param_description.h \
                         track/pilot_node.h \
                         track/track_manager.h \