Changeset 7155 in orxonox.OLD

Timestamp:

Feb 16, 2006, 2:54:15 PM (18 years ago)

Author:

bensch

Message:

importer compiles again

Location:

trunk/src

Files:

• subprojects/importer/Makefile.am (modified) (1 diff)
• world_entities/Makefile.am (modified) (4 diffs)
• world_entities/WorldEntities.am (modified) (6 diffs)

trunk/src/subprojects/importer/Makefile.am

@@ -16 +16 @@
 
 importer_DEPENDECIES = \
-                $(MAINSRCDIR)/util/libORXutils.a \
-                $(libORXlibs_a_LIBRARIES_)
+                $(MAINSRCDIR)/world_entities/libORXwe.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/util/libORXutils.a
 
 importer_LDADD = \
                 $(MAINSRCDIR)/util/libORXutils.a \
-                $(libORXlibs_a_LIBRARIES_)
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/world_entities/libORXwe.a \
+                $(libORXlibs_a_LIBRARIES_) \
+                $(MAINSRCDIR)/util/libORXutils.a
 
 importer_SOURCES= \
                 ../framework.cc \
                 importer.cc \
-                $(MAINSRCDIR)/world_entities/camera.cc
+                $(MAINSRCDIR)/world_entities/space_ships/space_ship.cc \
+                $(MAINSRCDIR)/world_entities/weapons/test_gun.cc
 
 

trunk/src/world_entities/Makefile.am

@@ -16 +16 @@
                 \
                 weapons/weapon_manager.cc \
+                weapons/crosshair.cc \
                 weapons/weapon.cc \
                 weapons/ammo_container.cc \
@@ -21 +22 @@
                 \
                 power_ups/power_up.cc \
+                power_ups/param_power_up.cc \
+                power_ups/weapon_power_up.cc \
                 \
-                spawning_point.cc
+                spawning_point.cc \
+                \
+                \
+                effects/explosion.cc
+
 
 
@@ -36 +43 @@
                 \
                 weapons/weapon_manager.h \
+                weapons/crosshair.h \
                 weapons/weapon.h \
                 weapons/ammo_container.h \
@@ -41 +49 @@
                 \
                 power_ups/power_up.h \
+                power_ups/param_power_up.h \
+                power_ups/weapon_power_up.h \
                 \
                 spawning_point.h \
                 \
+                \
+                effects/explosion.h \
                 \
                 $(WorldEntities_HEADERS_)

trunk/src/world_entities/WorldEntities.am

@@ -22 +22 @@
                 world_entities/weapons/hyperblaster.cc \
                 world_entities/weapons/aim.cc \
-                world_entities/weapons/crosshair.cc \
                 \
                 world_entities/projectiles/bomb.cc \
@@ -33 +32 @@
                 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 \
@@ -50 +47 @@
                 world_entities/elements/text_element.cc \
                 \
-                world_entities/effects/explosion.cc \
                 world_entities/effects/lightning_bolt.cc
 
@@ -76 +72 @@
                 weapons/targeting_turret.h \
                 weapons/aim.h \
-                weapons/crosshair.h \
                 \
                 projectiles/bomb.h \
@@ -87 +82 @@
                 power_ups/turret_power_up.h \
                 power_ups/laser_power_up.h \
-                power_ups/param_power_up.h \
-                power_ups/weapon_power_up.h \
                 \
                 space_ships/space_ship.h \
@@ -103 +96 @@
                 elements/text_element.h \
                 \
-                effects/explosion.h \
                 effects/lightning_bolt.h