Changeset 5968 in orxonox.OLD for branches/network/src/lib/Makefile.am

Timestamp:

Dec 7, 2005, 4:16:51 PM (18 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

File:

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

branches/network/src/lib/Makefile.am

@@ -15 +15 @@
                             network/libORXnet.a \
                             graphics/spatial_separation/libORXquadtree.a \
-                            tinyxml/libtinyxml.a \
+                            parser/tinyxml/libtinyxml.a \
+                            parser/ini_parser/libIniParser.a \
                             shell/libORXshell.a
 
@@ -29 +30 @@
                             network/libORXnet.a \
                             graphics/spatial_separation/libORXquadtree.a \
-                            tinyxml/libtinyxml.a \
                             shell/libORXshell.a \
                             $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
@@ -37 +37 @@
                         lang/base_object.cc \
                         lang/class_list.cc \
-                        util/ini_parser.cc \
                         util/substring.cc \
                         util/color.cc \
@@ -53 +52 @@
                         graphics/render2D/render_2d.h \
                         lang/class_list.h \
-                        util/ini_parser.h \
                         util/substring.h \
                         util/array.h \
@@ -75 +73 @@
           collision_detection \
           network \
-          tinyxml \
+          parser \
           shell \
           gui \