|
Last change
on this file since 5842 was
5750,
checked in by bensch, 19 years ago
|
|
orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD
conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk
|
|
File size:
1021 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 | garbage_collector.cc \ |
|---|
| 10 | state.cc \ |
|---|
| 11 | user_control.cc \ |
|---|
| 12 | animation/animation3d.cc \ |
|---|
| 13 | animation/animation.cc \ |
|---|
| 14 | animation/animation_player.cc \ |
|---|
| [5479] | 15 | loading/resource_manager.cc \ |
|---|
| [5463] | 16 | loading/game_loader.cc \ |
|---|
| 17 | loading/load_param.cc \ |
|---|
| [5546] | 18 | loading/load_param_description.cc \ |
|---|
| [5463] | 19 | track/pilot_node.cc \ |
|---|
| 20 | track/track_manager.cc \ |
|---|
| [5750] | 21 | track/track_node.cc |
|---|
| [5349] | 22 | |
|---|
| [5350] | 23 | noinst_HEADERS = fast_factory.h \ |
|---|
| [5750] | 24 | object_manager.h \ |
|---|
| [5350] | 25 | garbage_collector.h \ |
|---|
| 26 | state.h \ |
|---|
| 27 | user_control.h \ |
|---|
| 28 | animation/animation3d.h \ |
|---|
| 29 | animation/animation.h \ |
|---|
| 30 | animation/animation_player.h \ |
|---|
| 31 | animation/t_animation.h \ |
|---|
| [5479] | 32 | loading/resource_manager.h \ |
|---|
| [5350] | 33 | loading/factory.h \ |
|---|
| 34 | loading/game_loader.h \ |
|---|
| 35 | loading/load_param.h \ |
|---|
| [5546] | 36 | loading/load_param_description.h \ |
|---|
| [5350] | 37 | track/pilot_node.h \ |
|---|
| 38 | track/track_manager.h \ |
|---|
| 39 | track/track_node.h |
|---|
Note: See
TracBrowser
for help on using the repository browser.
