Changeset 5822 in orxonox.OLD for trunk/src/lib/Makefile.am

Timestamp:

Nov 29, 2005, 2:22:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network to the trunk
merged with command:
svn merge -r 5505:HEAD branches/network trunk

conflicts resolved in favor of the trunk (as always
also fixed a typo in the #include "SDL_tread.h"

File:

• trunk/src/lib/Makefile.am (modified) (3 diffs)

trunk/src/lib/Makefile.am

@@ -13 +13 @@
                             particles/libORXparticles.a \
                             collision_detection/libORXcd.a \
+                            network/libORXnet.a \
                             graphics/spatial_separation/libORXquadtree.a \
                             tinyxml/libtinyxml.a \
@@ -26 +27 @@
                             particles/libORXparticles.a \
                             collision_detection/libORXcd.a \
+                            network/libORXnet.a \
                             graphics/spatial_separation/libORXquadtree.a \
                             tinyxml/libtinyxml.a \
@@ -72 +74 @@
           particles \
           collision_detection \
+          network \
           tinyxml \
           shell \