Last change
on this file since 6294 was
6142,
checked in by bensch, 19 years ago
|
orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/
conflicts resolution was easy this time
but specially merged the world to network_world
|
File size:
969 bytes
|
Rev | Line | |
---|
[5349] | 1 | MAINSRCDIR=.. |
---|
| 2 | include $(MAINSRCDIR)/defs/include_paths.am |
---|
| 3 | |
---|
[5463] | 4 | noinst_LIBRARIES = libORXutils.a |
---|
[5349] | 5 | |
---|
[5463] | 6 | libORXutils_a_SOURCES = fast_factory.cc \ |
---|
[5750] | 7 | object_manager.cc \ |
---|
[5546] | 8 | loading/factory.cc \ |
---|
[5463] | 9 | state.cc \ |
---|
| 10 | user_control.cc \ |
---|
| 11 | animation/animation3d.cc \ |
---|
| 12 | animation/animation.cc \ |
---|
| 13 | animation/animation_player.cc \ |
---|
[5479] | 14 | loading/resource_manager.cc \ |
---|
[5463] | 15 | loading/game_loader.cc \ |
---|
| 16 | loading/load_param.cc \ |
---|
[5546] | 17 | loading/load_param_description.cc \ |
---|
[5463] | 18 | track/pilot_node.cc \ |
---|
| 19 | track/track_manager.cc \ |
---|
[6142] | 20 | track/track_node.cc |
---|
[5349] | 21 | |
---|
[5350] | 22 | noinst_HEADERS = fast_factory.h \ |
---|
[5750] | 23 | object_manager.h \ |
---|
[5350] | 24 | state.h \ |
---|
| 25 | user_control.h \ |
---|
| 26 | animation/animation3d.h \ |
---|
| 27 | animation/animation.h \ |
---|
| 28 | animation/animation_player.h \ |
---|
| 29 | animation/t_animation.h \ |
---|
[5479] | 30 | loading/resource_manager.h \ |
---|
[5350] | 31 | loading/factory.h \ |
---|
| 32 | loading/game_loader.h \ |
---|
| 33 | loading/load_param.h \ |
---|
[5546] | 34 | loading/load_param_description.h \ |
---|
[5350] | 35 | track/pilot_node.h \ |
---|
| 36 | track/track_manager.h \ |
---|
| 37 | track/track_node.h |
---|
Note: See
TracBrowser
for help on using the repository browser.