Changeset 5961 in orxonox.OLD for branches/avi_play/src/Makefile.am

Timestamp:

Dec 7, 2005, 2:53:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the trunk back to the avi_play branche again
merged with command
svn merge -r 5924:HEAD ../trunk/ avi_play/

File:

• branches/avi_play/src/Makefile.am (modified) (2 diffs)

branches/avi_play/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 \