Changeset 6432 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 8, 2006, 1:15:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better build process: fake convenience lib through include of necessary files

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (1 diff)
• npcs/ground_turret.cc (moved) (moved from trunk/src/world_entities/weapons/ground_turret.cc) (1 diff)
• npcs/ground_turret.h (moved) (moved from trunk/src/world_entities/weapons/ground_turret.h)

trunk/src/world_entities/Makefile.am

@@ -1 @@
-MAINSRCDIR=..
-include $(MAINSRCDIR)/defs/include_paths.am
+#MAINSRCDIR=..
+#include $(MAINSRCDIR)/defs/include_paths.am
 
-noinst_LIBRARIES = libORXworld_entities.a
+#noinst_LIBRARIES = libORXworld_entities.a
+#libORXworld_entities_a_SOURCES =
+#subdirs = .
 
-libORXworld_entities_a_SOURCES = \
-                  world_entity.cc \
-                  camera.cc \
-                  playable.cc \
-                  player.cc \
-                  npc.cc \
-                  npc2.cc \
-                  environment.cc \
-                  skysphere.cc \
-                  skybox.cc \
-                  terrain.cc \
-                  satellite.cc \
-                  character_attributes.cc \
-                  test_entity.cc \
-                  space_ships/space_ship.cc \
-                  creatures/md2_creature.cc \
-                  weapons/weapon_manager.cc \
-                  weapons/weapon.cc \
-                  weapons/test_gun.cc \
-                  weapons/turret.cc \
-                  weapons/projectile.cc \
-                  weapons/test_bullet.cc \
-                  weapons/rocket.cc \
-                  weapons/laser.cc \
-                  weapons/ground_turret.cc \
-                  weapons/crosshair.cc \
-                  weapons/ground_turret.cc \
-                  power_ups/power_up.cc \
-                  power_ups/turret_power_up.cc \
-                  power_ups/laser_power_up.cc
+WorldEntities_SOURCES_ = \
+                  world_entities/world_entity.cc \
+                  world_entities/camera.cc \
+                  world_entities/playable.cc \
+                  world_entities/player.cc \
+                  world_entities/npcs/npc.cc \
+                  world_entities/npcs/npc_test1.cc \
+                  world_entities/npcs/npc_test.cc \
+                  world_entities/npcs/ground_turret.cc \
+                  world_entities/environment.cc \
+                  world_entities/skysphere.cc \
+                  world_entities/skybox.cc \
+                  world_entities/terrain.cc \
+                  world_entities/satellite.cc \
+                  world_entities/character_attributes.cc \
+                  world_entities/test_entity.cc \
+                  world_entities/weapons/weapon_manager.cc \
+                  world_entities/weapons/weapon.cc \
+                  world_entities/weapons/projectile.cc \
+                  world_entities/weapons/test_gun.cc \
+                  world_entities/weapons/turret.cc \
+                  world_entities/weapons/aiming_turret.cc \
+                  world_entities/weapons/targeting_turret.cc \
+                  world_entities/weapons/cannon.cc \
+                  world_entities/weapons/test_bullet.cc \
+                  world_entities/weapons/rocket.cc \
+                  world_entities/weapons/guided_missile.cc \
+                  world_entities/weapons/laser.cc \
+                  world_entities/weapons/aim.cc \
+                  world_entities/weapons/bomb.cc \
+                  world_entities/weapons/crosshair.cc \
+                  world_entities/power_ups/power_up.cc \
+                  world_entities/power_ups/turret_power_up.cc \
+                  world_entities/power_ups/laser_power_up.cc \
+                  world_entities/power_ups/weapon_power_up.cc \
+                  world_entities/power_ups/param_power_up.cc \
+                  world_entities/space_ships/space_ship.cc \
+                  world_entities/space_ships/helicopter.cc \
+                  world_entities/creatures/md2_creature.cc \
+                  world_entities/spawning_point.cc
 
-noinst_HEADERS = \
-                 world_entity.h \
-                 camera.h \
-                 playable.h \
-                 player.h \
-                 npc.h \
-                 npc2.h \
-                 environment.h \
-                 skysphere.h \
-                 skybox.h \
-                 terrain.h \
-                 satellite.h \
-                 character_attributes.h \
-                 test_entity.h \
-                 space_ships/space_ship.h \
-                 creatures/md2_creature.cc \
-                 weapons/weapon_manager.h \
-                 weapons/weapon.h \
-                 weapons/projectile.h \
-                 weapons/test_gun.h \
-                 weapons/turret.h \
-                 weapons/test_bullet.h \
-                 weapons/crosshair.h \
-                 power_ups/power_up.h \
-                 power_ups/turret_power_up.h \
-                 power_ups/laser_power_up.h
-
-
-SUBDIRS = .          .
+WorldEntities_HEADERS_ = \
+                 world_entities/world_entity.h \
+                 world_entities/camera.h \
+                 world_entities/extendable.h \
+                 world_entities/playable.h \
+                 world_entities/player.h \
+                 world_entities/npcs/npc.h \
+                 world_entities/npcs/npc_test.h \
+                 world_entities/npcs/npc_test1.h \
+                 world_entities/environment.h \
+                 world_entities/skysphere.h \
+                 world_entities/skybox.h \
+                 world_entities/terrain.h \
+                 world_entities/satellite.h \
+                 world_entities/character_attributes.h \
+                 world_entities/test_entity.h \
+                 world_entities/weapons/weapon_manager.h \
+                 world_entities/weapons/weapon.h \
+                 world_entities/weapons/projectile.h \
+                 world_entities/weapons/test_gun.h \
+                 world_entities/weapons/cannon.h \
+                 world_entities/weapons/turret.h \
+                 world_entities/weapons/aiming_turret.h \
+                 world_entities/weapons/targeting_turret.h \
+                 world_entities/weapons/test_bullet.h \
+                 world_entities/weapons/rocket.h \
+                 world_entities/weapons/guided_missile.h \
+                 world_entities/weapons/laser.h \
+                 world_entities/weapons/aim.h \
+                 world_entities/weapons/bomb.h \
+                 world_entities/weapons/crosshair.h \
+                 world_entities/power_ups/power_up.h \
+                 world_entities/power_ups/turret_power_up.h \
+                 world_entities/power_ups/laser_power_up.h \
+                 world_entities/power_ups/param_power_up.h \
+                 world_entities/power_ups/weapon_power_up.h \
+                 world_entities/space_ships/space_ship.h \
+                 world_entities/space_ships/helicopter.h \
+                 world_entities/creatures/md2_creature.h \
+                 world_entities/spawning_point.h

trunk/src/world_entities/npcs/ground_turret.cc

@@ -16 +16 @@
 #include "ground_turret.h"
 #include "model.h"
-#include "turret.h"
+#include "world_entities/weapons/turret.h"
 
 #include "factory.h"