Changeset 5955 in orxonox.OLD for branches/powerups/src/Makefile.am

Timestamp:

Dec 7, 2005, 1:05:10 PM (18 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

• branches/powerups/src/Makefile.am (modified) (5 diffs)

branches/powerups/src/Makefile.am

@@ -21 +21 @@
                        lib/collision_detection/libORXcd.a \
                        lib/graphics/spatial_separation/libORXquadtree.a \
-                       lib/tinyxml/libtinyxml.a \
+                       lib/parser/tinyxml/libtinyxml.a \
+                       lib/parser/ini_parser/libIniParser.a \
                        lib/gui/gl_gui/libORXglgui.a \
                        lib/shell/libORXshell.a
@@ -36 +37 @@
                 lib/particles/libORXparticles.a \
                 lib/graphics/spatial_separation/libORXquadtree.a \
-                lib/tinyxml/libtinyxml.a \
+                lib/parser/tinyxml/libtinyxml.a \
+                lib/parser/ini_parser/libIniParser.a \
                 lib/gui/gl_gui/libORXglgui.a \
                 lib/shell/libORXshell.a \
@@ -47 +49 @@
                   world_entities/world_entity.cc \
                   world_entities/camera.cc \
+                  world_entities/playable.cc \
                   world_entities/player.cc \
                   world_entities/npcs/npc.cc \
@@ -76 +79 @@
                   world_entities/power_ups/turret_power_up.cc \
                   world_entities/power_ups/laser_power_up.cc \
+                  world_entities/space_ships/space_ship.cc \
                   subprojects/benchmark.cc
 
@@ -87 +91 @@
                  world_entities/world_entity.h \
                  world_entities/camera.h \
+                 world_entities/playable.h \
                  world_entities/player.h \
                  world_entities/npcs/npc.h \