Changeset 7151 in orxonox.OLD
- Timestamp:
- Feb 16, 2006, 2:29:21 PM (18 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
-
configure.ac (modified) (2 diffs)
-
src/Makefile.am (modified) (5 diffs)
-
src/lib/BuildLibs.am (modified) (1 diff)
-
src/subprojects/importer/Makefile.am (modified) (1 diff)
-
src/util/Makefile.am (modified) (3 diffs)
-
src/world_entities/Makefile.am (modified) (1 diff)
-
src/world_entities/WorldEntities.am (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.ac
r7127 r7151 635 635 src/lib/particles/Makefile 636 636 src/lib/collision_detection/Makefile 637 637 src/lib/network/Makefile 638 638 src/lib/shell/Makefile 639 639 src/lib/gui/Makefile … … 644 644 src/lib/parser/ini_parser/Makefile 645 645 src/util/Makefile 646 src/world_entities/Makefile 646 647 src/subprojects/Makefile 647 648 src/subprojects/testmain/Makefile -
trunk/src/Makefile.am
r7036 r7151 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 include world_entities/ Makefile.am4 include world_entities/WorldEntities.am 5 5 include story_entities/Makefile.am 6 7 LIB_PREFIX=lib 6 8 include lib/BuildLibs.am 7 9 … … 14 16 15 17 orxonox_DEPENDENCIES = \ 18 world_entities/libORXwe.a \ 16 19 util/libORXutils.a \ 17 20 $(libORXlibs_a_LIBRARIES_) 18 21 19 orxonox_LDADD = util/libORXutils.a \ 22 orxonox_LDADD = \ 23 world_entities/libORXwe.a \ 24 util/libORXutils.a \ 20 25 $(libORXlibs_a_LIBRARIES_) \ 21 26 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) … … 38 43 39 44 noinst_HEADERS = \ 40 $(WorldEntities_HEADERS_) \41 45 $(StoryEntities_HEADERS_) \ 42 46 orxonox.h \ … … 65 69 proto/proto_world_entity.cc \ 66 70 defs/include_paths.am \ 67 world_entities/Makefile.am \68 71 story_entities/Makefile.am 69 72 … … 76 79 SUBDIRS = lib \ 77 80 util \ 81 world_entities \ 78 82 . \ 79 83 $(SUB_PROGS) -
trunk/src/lib/BuildLibs.am
r7033 r7151 1 LIB_PREFIX=lib2 1 3 2 libORXlibs_a_LIBRARIES_ = \ -
trunk/src/subprojects/importer/Makefile.am
r6802 r7151 2 2 include $(MAINSRCDIR)/defs/include_paths.am 3 3 4 importer_CPPFLAGS = 4 LIB_PREFIX=$(MAINSRCDIR)/lib 5 include $(MAINSRCDIR)/lib/BuildLibs.am 5 6 6 importer_LDFLAGS = $(MWINDOWS)7 7 8 bin_PROGRAMS = \ 8 importer_LDFLAGS = \ 9 $(MWINDOWS) 10 11 12 bin_PROGRAMS = \ 9 13 importer \ 10 14 multitex \ 11 15 movie_player_test 12 16 17 importer_DEPENDECIES = \ 18 $(MAINSRCDIR)/util/libORXutils.a \ 19 $(libORXlibs_a_LIBRARIES_) 20 13 21 importer_LDADD = \ 14 $(MAINSRCDIR)/lib/network/libORXnet.a \ 15 $(MAINSRCDIR)/lib/event/libORXevent.a \ 16 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \ 17 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \ 18 $(MAINSRCDIR)/lib/shell/libORXshell.a \ 19 $(MAINSRCDIR)/lib/sound/libORXsound.a \ 20 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \ 21 $(MAINSRCDIR)/lib/graphics/importer/libtc.a 22 $(MAINSRCDIR)/util/libORXutils.a \ 23 $(libORXlibs_a_LIBRARIES_) 22 24 23 25 importer_SOURCES= \ 24 26 ../framework.cc \ 25 importer.cc \ 26 $(MAINSRCDIR)/util/state.cc \ 27 $(MAINSRCDIR)/world_entities/camera.cc \ 28 $(MAINSRCDIR)/lib/lang/base_object.cc \ 29 $(MAINSRCDIR)/lib/lang/class_list.cc \ 30 $(MAINSRCDIR)/lib/math/vector.cc \ 31 $(MAINSRCDIR)/lib/math/quaternion.cc \ 32 $(MAINSRCDIR)/util/loading/resource_manager.cc \ 33 $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \ 34 $(MAINSRCDIR)/lib/coord/p_node.cc \ 35 $(MAINSRCDIR)/util/loading/load_param.cc \ 36 $(MAINSRCDIR)/util/loading/load_param_description.cc \ 37 $(MAINSRCDIR)/lib/util/helper_functions.cc \ 38 $(MAINSRCDIR)/lib/util/substring.cc \ 39 $(MAINSRCDIR)/lib/util/color.cc \ 40 $(MAINSRCDIR)/lib/util/multi_type.cc \ 41 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 42 $(MAINSRCDIR)/util/loading/factory.cc 27 importer.cc \ 28 $(MAINSRCDIR)/world_entities/camera.cc 43 29 44 45 46 multitex_LDADD = \47 $(MAINSRCDIR)/lib/event/libORXevent.a \48 $(MAINSRCDIR)/lib/network/libORXnet.a \49 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \50 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \51 $(MAINSRCDIR)/lib/shell/libORXshell.a \52 $(MAINSRCDIR)/lib/sound/libORXsound.a \53 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a54 30 55 31 multitex_SOURCES= \ 56 32 ../framework.cc \ 57 33 multitex.cc \ 58 $(MAINSRCDIR)/util/state.cc \ 59 $(MAINSRCDIR)/world_entities/camera.cc \ 60 $(MAINSRCDIR)/lib/lang/base_object.cc \ 61 $(MAINSRCDIR)/lib/lang/class_list.cc \ 62 $(MAINSRCDIR)/lib/math/vector.cc \ 63 $(MAINSRCDIR)/lib/math/quaternion.cc \ 64 $(MAINSRCDIR)/util/loading/resource_manager.cc \ 65 $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \ 66 $(MAINSRCDIR)/lib/coord/p_node.cc \ 67 $(MAINSRCDIR)/util/loading/load_param.cc \ 68 $(MAINSRCDIR)/util/loading/load_param_description.cc \ 69 $(MAINSRCDIR)/lib/util/helper_functions.cc \ 70 $(MAINSRCDIR)/lib/util/substring.cc \ 71 $(MAINSRCDIR)/lib/util/color.cc \ 72 $(MAINSRCDIR)/lib/util/multi_type.cc \ 73 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 74 $(MAINSRCDIR)/util/loading/factory.cc 75 76 movie_player_test_LDADD = \ 77 $(MAINSRCDIR)/lib/event/libORXevent.a \ 78 $(MAINSRCDIR)/lib/network/libORXnet.a \ 79 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \ 80 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \ 81 $(MAINSRCDIR)/lib/shell/libORXshell.a \ 82 $(MAINSRCDIR)/lib/sound/libORXsound.a \ 83 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a 34 $(MAINSRCDIR)/world_entities/camera.cc 84 35 85 36 movie_player_test_SOURCES= \ 86 37 ../framework.cc \ 87 38 movie_player_test.cc \ 88 $(MAINSRCDIR)/util/state.cc \ 89 $(MAINSRCDIR)/world_entities/camera.cc \ 90 $(MAINSRCDIR)/lib/lang/base_object.cc \ 91 $(MAINSRCDIR)/lib/lang/class_list.cc \ 92 $(MAINSRCDIR)/lib/math/vector.cc \ 93 $(MAINSRCDIR)/util/loading/resource_manager.cc \ 94 $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \ 95 $(MAINSRCDIR)/lib/coord/p_node.cc \ 96 $(MAINSRCDIR)/util/loading/load_param.cc \ 97 $(MAINSRCDIR)/util/loading/load_param_description.cc \ 98 $(MAINSRCDIR)/lib/util/helper_functions.cc \ 99 $(MAINSRCDIR)/lib/util/substring.cc \ 100 $(MAINSRCDIR)/lib/util/color.cc \ 101 $(MAINSRCDIR)/lib/util/multi_type.cc \ 102 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 103 $(MAINSRCDIR)/util/loading/factory.cc 39 $(MAINSRCDIR)/world_entities/camera.cc -
trunk/src/util/Makefile.am
r7034 r7151 11 11 game_rules.cc \ 12 12 multiplayer_team_deathmatch.cc \ 13 \ 13 14 animation/animation3d.cc \ 14 15 animation/animation.cc \ 15 16 animation/animation_player.cc \ 17 \ 16 18 loading/resource_manager.cc \ 17 19 loading/game_loader.cc \ 18 20 loading/load_param.cc \ 19 21 loading/load_param_description.cc \ 22 \ 20 23 track/pilot_node.cc \ 21 24 track/track_manager.cc \ … … 28 31 game_rules.h \ 29 32 multiplayer_team_deathmatch.h \ 33 \ 30 34 animation/animation3d.h \ 31 35 animation/animation.h \ 32 36 animation/animation_player.h \ 33 37 animation/t_animation.h \ 38 \ 34 39 loading/resource_manager.h \ 35 40 loading/factory.h \ … … 37 42 loading/load_param.h \ 38 43 loading/load_param_description.h \ 44 \ 39 45 track/pilot_node.h \ 40 46 track/track_manager.h \ -
trunk/src/world_entities/Makefile.am
r7110 r7151 1 #MAINSRCDIR=.. 2 #include $(MAINSRCDIR)/defs/include_paths.am 1 MAINSRCDIR=.. 2 include $(MAINSRCDIR)/defs/include_paths.am 3 include WorldEntities.am 3 4 4 #noinst_LIBRARIES = libORXworld_entities.a 5 #libORXworld_entities_a_SOURCES = 5 6 noinst_LIBRARIES = libORXwe.a 6 7 #subdirs = . 7 8 8 WorldEntities_SOURCES_ = \ 9 world_entities/world_entity.cc \ 10 world_entities/camera.cc \ 11 world_entities/playable.cc \ 12 world_entities/player.cc \ 13 world_entities/npcs/npc.cc \ 14 world_entities/npcs/npc_test1.cc \ 15 world_entities/npcs/npc_test.cc \ 16 world_entities/npcs/ground_turret.cc \ 17 world_entities/environment.cc \ 18 world_entities/skysphere.cc \ 19 world_entities/skybox.cc \ 20 world_entities/terrain.cc \ 21 world_entities/satellite.cc \ 22 world_entities/movie_entity.cc \ 23 world_entities/recorder.cc \ 24 world_entities/character_attributes.cc \ 25 world_entities/test_entity.cc \ 26 world_entities/planet.cc \ 27 \ 28 world_entities/weapons/weapon_manager.cc \ 29 world_entities/weapons/ammo_container.cc \ 30 world_entities/weapons/weapon.cc \ 31 world_entities/weapons/test_gun.cc \ 32 world_entities/weapons/turret.cc \ 33 world_entities/weapons/aiming_turret.cc \ 34 world_entities/weapons/targeting_turret.cc \ 35 world_entities/weapons/cannon.cc \ 36 world_entities/weapons/hyperblaster.cc \ 37 world_entities/weapons/aim.cc \ 38 world_entities/weapons/crosshair.cc \ 39 \ 40 world_entities/projectiles/projectile.cc \ 41 world_entities/projectiles/bomb.cc \ 42 world_entities/projectiles/laser.cc \ 43 world_entities/projectiles/test_bullet.cc \ 44 world_entities/projectiles/rocket.cc \ 45 world_entities/projectiles/guided_missile.cc \ 46 world_entities/projectiles/hyperblast.cc \ 47 \ 48 world_entities/power_ups/power_up.cc \ 49 world_entities/power_ups/turret_power_up.cc \ 50 world_entities/power_ups/laser_power_up.cc \ 51 world_entities/power_ups/weapon_power_up.cc \ 52 world_entities/power_ups/param_power_up.cc \ 53 \ 54 world_entities/space_ships/space_ship.cc \ 55 world_entities/space_ships/helicopter.cc \ 56 world_entities/space_ships/hover.cc \ 57 world_entities/space_ships/turbine_hover.cc \ 58 world_entities/creatures/md2_creature.cc \ 59 \ 60 world_entities/spawning_point.cc \ 61 \ 62 world_entities/environments/water.cc \ 63 world_entities/environments/model_entity.cc \ 64 world_entities/environments/building.cc \ 65 \ 66 world_entities/elements/image_entity.cc \ 67 world_entities/elements/text_element.cc \ 68 \ 69 world_entities/effects/explosion.cc \ 70 world_entities/effects/lightning_bolt.cc 9 ## THESE ARE THE BASE CLASSES OF ALL WORLD_ENTITIES 10 libORXwe_a_SOURCES = \ 11 world_entity.cc \ 12 \ 13 camera.cc \ 14 playable.cc \ 15 player.cc \ 16 \ 17 npcs/npc.cc \ 18 \ 19 weapons/weapon_manager.cc \ 20 weapons/weapon.cc \ 21 weapons/ammo_container.cc \ 22 projectiles/projectile.cc \ 23 \ 24 power_ups/power_up.cc \ 25 \ 26 spawning_point.cc 71 27 72 28 73 WorldEntities_HEADERS_ = \ 74 world_entities/world_entity.h \ 75 world_entities/camera.h \ 76 world_entities/extendable.h \ 77 world_entities/playable.h \ 78 world_entities/player.h \ 79 world_entities/npcs/npc.h \ 80 world_entities/npcs/npc_test.h \ 81 world_entities/npcs/npc_test1.h \ 82 world_entities/npcs/ground_turret.h \ 83 world_entities/environment.h \ 84 world_entities/skysphere.h \ 85 world_entities/skybox.h \ 86 world_entities/terrain.h \ 87 world_entities/satellite.h \ 88 world_entities/movie_entity.h \ 89 world_entities/recorder.h \ 90 world_entities/character_attributes.h \ 91 world_entities/test_entity.h \ 92 world_entities/planet.h \ 93 \ 94 world_entities/weapons/weapon_manager.h \ 95 world_entities/weapons/ammo_container.h \ 96 world_entities/weapons/weapon.h \ 97 world_entities/weapons/test_gun.h \ 98 world_entities/weapons/cannon.h \ 99 world_entities/weapons/hyperblaster.h \ 100 world_entities/weapons/turret.h \ 101 world_entities/weapons/aiming_turret.h \ 102 world_entities/weapons/targeting_turret.h \ 103 world_entities/weapons/aim.h \ 104 world_entities/weapons/crosshair.h \ 105 \ 106 world_entities/projectiles/projectile.h \ 107 world_entities/projectiles/bomb.h \ 108 world_entities/projectiles/laser.h \ 109 world_entities/projectiles/test_bullet.h \ 110 world_entities/projectiles/rocket.h \ 111 world_entities/projectiles/guided_missile.h \ 112 world_entities/projectiles/hyperblast.h \ 113 \ 114 world_entities/power_ups/power_up.h \ 115 world_entities/power_ups/turret_power_up.h \ 116 world_entities/power_ups/laser_power_up.h \ 117 world_entities/power_ups/param_power_up.h \ 118 world_entities/power_ups/weapon_power_up.h \ 119 \ 120 world_entities/space_ships/space_ship.h \ 121 world_entities/space_ships/helicopter.h \ 122 world_entities/space_ships/hover.h \ 123 world_entities/space_ships/turbine_hover.h \ 124 world_entities/creatures/md2_creature.h \ 125 \ 126 world_entities/spawning_point.h \ 127 \ 128 world_entities/environments/water.h \ 129 world_entities/environments/model_entity.h \ 130 world_entities/environments/building.h \ 131 \ 132 world_entities/elements/image_entity.h \ 133 world_entities/elements/text_element.h \ 134 \ 135 world_entities/effects/explosion.h \ 136 world_entities/effects/lightning_bolt.h 29 noinst_HEADERS = \ 30 world_entity.h \ 31 \ 32 camera.h \ 33 extendable.h \ 34 playable.h \ 35 player.h \ 36 \ 37 npcs/npc.h \ 38 \ 39 weapons/weapon_manager.h \ 40 weapons/weapon.h \ 41 weapons/ammo_container.h \ 42 projectiles/projectile.h \ 43 \ 44 power_ups/power_up.h \ 45 \ 46 spawning_point.h 47 \ 48 \ 49 $(WorldEntities_HEADERS_) 137 50 138 51 52 EXTRA_DIST = WorldEntities.am
Note: See TracChangeset
for help on using the changeset viewer.
