Changeset 7281 in orxonox.OLD for branches/shared_lib/src/world_entities

Timestamp:

Apr 10, 2006, 6:09:46 PM (19 years ago)

Author:

bensch

Message:

this really should compile and link (not at runtime) on windows

Location:

branches/shared_lib/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• world_entity.am (moved) (moved from branches/shared_lib/src/world_entities/WorldEntities.am) (1 diff)

branches/shared_lib/src/world_entities/Makefile.am

@@ -41 +41 @@
 #               npcs/npc.cc
 
-AM_LDFLAGS = -module -no-undefined
+AM_LDFLAGS = -no-undefined
 
 pkglib_LTLIBRARIES = \
@@ -109 +109 @@
                 effects/lightning_bolt.cc
 
+
+EXTRA_DIST = \
+                world_entity.am
 
 noinst_HEADERS  = \

branches/shared_lib/src/world_entities/world_entity.am

@@ -1 +1 @@
 ## THE SUBCLASSES. THESE MUST BE DYNAMICALLY LINKED OR COMPILED IN DIRECTLY
-WorldEntities_SOURCES_ = \
-                world_entities/npcs/npc_test1.cc \
-                world_entities/npcs/npc_test.cc \
+WorldEntities_LIBRARIES_ = \
+                $(WORLDENTITY_PREFIX)/libORXplayables.la \
+                $(WORLDENTITY_PREFIX)/libORXweapons.la \
+                $(WORLDENTITY_PREFIX)/libORXprojectiles.la \
+                $(WORLDENTITY_PREFIX)/libORXpower_ups.la \
                 \
-                world_entities/environment.cc \
-                world_entities/skysphere.cc \
-                world_entities/skybox.cc \
-                world_entities/terrain.cc \
-                world_entities/satellite.cc \
-                world_entities/movie_entity.cc \
-                world_entities/recorder.cc \
-                world_entities/character_attributes.cc \
-                world_entities/test_entity.cc \
-                world_entities/planet.cc \
+                $(WORLDENTITY_PREFIX)/libORXenvironmentals.la \
                 \
-                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/hyperblaster.cc \
-                world_entities/weapons/aim.cc \
+                $(WORLDENTITY_PREFIX)/libORXnpcs.la \
                 \
-                world_entities/projectiles/bomb.cc \
-                world_entities/projectiles/laser.cc \
-                world_entities/projectiles/test_bullet.cc \
-                world_entities/projectiles/rocket.cc \
-                world_entities/projectiles/guided_missile.cc \
-                world_entities/projectiles/hyperblast.cc \
-                \
-                world_entities/power_ups/turret_power_up.cc \
-                world_entities/power_ups/laser_power_up.cc \
-                \
-                world_entities/space_ships/space_ship.cc \
-                world_entities/space_ships/helicopter.cc \
-                world_entities/space_ships/hover.cc \
-                world_entities/space_ships/turbine_hover.cc \
-                world_entities/creatures/md2_creature.cc \
-                \
-                \
-                world_entities/environments/water.cc \
-                world_entities/environments/model_entity.cc \
-                world_entities/environments/building.cc \
-                \
-                world_entities/elements/image_entity.cc \
-                world_entities/elements/text_element.cc \
-                \
-                world_entities/effects/lightning_bolt.cc
-
-
+                $(WORLDENTITY_PREFIX)/libORXmisc_entities.la