Changeset 6139 in orxonox.OLD for trunk/src/Makefile.am

Timestamp:

Dec 16, 2005, 6:45:32 PM (18 years ago)

Author:

patrick

Message:

trunk: merged branche network with trunk using command: svn merge -r5999:HEAD, conflicts resolved in favor of the trunk bla

File:

• trunk/src/Makefile.am (modified) (5 diffs)

trunk/src/Makefile.am

@@ -25 +25 @@
                        lib/gui/gl_gui/libORXglgui.a \
                        lib/shell/libORXshell.a \
-                       lib/network/libORXnet.a 
+                       lib/network/libORXnet.a
 
 orxonox_LDADD = util/libORXutils.a \
@@ -49 +49 @@
                   story_entities/campaign.cc \
                   story_entities/world.cc \
+                  story_entities/network_world.cc \
                   world_entities/world_entity.cc \
                   world_entities/camera.cc \
@@ -85 +86 @@
                   world_entities/space_ships/space_ship.cc \
                   world_entities/space_ships/helicopter.cc \
+                  world_entities/spawning_point.cc \
                   subprojects/benchmark.cc
 
@@ -94 +96 @@
                  story_entities/campaign.h \
                  story_entities/world.h \
+                 story_entities/network_world.h \
                  world_entities/world_entity.h \
                  world_entities/camera.h \
@@ -130 +133 @@
                  world_entities/space_ships/space_ship.h \
                  world_entities/space_ships/helicopter.h \
+                 world_entities/spawning_point.h \
                  defs/stdincl.h \
                  defs/stdlibincl.h \