Changeset 6393 in orxonox.OLD for branches/preferences

Timestamp:

Jan 3, 2006, 3:04:01 PM (19 years ago)

Author:

rennerc

Message:

added libargp to orxonox

Location:

branches/preferences

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/lib/Makefile.am (modified) (2 diffs)
• src/lib/argp (added)
• src/lib/argp/Makefile.am (added)
• src/lib/argp/argp-ba.c (added)
• src/lib/argp/argp-eexst.c (added)
• src/lib/argp/argp-fmtstream.c (added)
• src/lib/argp/argp-fmtstream.h (added)
• src/lib/argp/argp-help.c (added)
• src/lib/argp/argp-namefrob.h (added)
• src/lib/argp/argp-parse.c (added)
• src/lib/argp/argp-pv.c (added)
• src/lib/argp/argp-pvh.c (added)
• src/lib/argp/argp-test.c (added)
• src/lib/argp/argp.h (added)
• src/lib/argp/mempcpy.c (added)
• src/lib/argp/strchrnul.c (added)
• src/lib/argp/strndup.c (added)
• src/lib/parser/preferences/cmd_line_prefs_reader.h (modified) (1 diff)

branches/preferences/configure.ac

@@ -612 +612 @@
                  src/lib/parser/ini_parser/Makefile
                  src/lib/parser/preferences/Makefile
+                 src/lib/argp/Makefile
                  src/util/Makefile
                  src/subprojects/Makefile

branches/preferences/src/Makefile.am

@@ -26 +26 @@
                        lib/gui/gl_gui/libORXglgui.a \
                        lib/shell/libORXshell.a \
-                       lib/network/libORXnet.a
+                       lib/network/libORXnet.a \
+                       lib/argp/libargp.a
 
 orxonox_LDADD = util/libORXutils.a \
@@ -45 +46 @@
                 lib/shell/libORXshell.a \
                 lib/network/libORXnet.a \
-                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+                lib/argp/libargp.a \
+                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
 orxonox_SOURCES = orxonox.cc \

branches/preferences/src/lib/Makefile.am

@@ -17 +17 @@
                             parser/tinyxml/libtinyxml.a \
                             parser/ini_parser/libIniParser.a \
-                            shell/libORXshell.a
+                            shell/libORXshell.a \
+                            argp/libargp.a
 
 #libORXlibs_a_LIBDADD =     gui/gtk_gui/libORXgui.a \
-                            gui/gl_gui/libORXglgui.a \
-                            graphics/importer/libORXimporter.a \
-                            graphics/libORXgraphics.a \
-                            sound/libORXsound.a \
-                            event/libORXevent.a \
-                            physics/libORXphysics.a \
-                            particles/libORXparticles.a \
-                            collision_detection/libORXcd.a \
-                            network/libORXnet.a \
-                            graphics/spatial_separation/libORXquadtree.a \
-                            shell/libORXshell.a \
-                            $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
+#                            gui/gl_gui/libORXglgui.a \
+#                            graphics/importer/libORXimporter.a \
+#                            graphics/libORXgraphics.a \
+#                            sound/libORXsound.a \
+#                            event/libORXevent.a \
+#                            physics/libORXphysics.a \
+#                            particles/libORXparticles.a \
+#                            collision_detection/libORXcd.a \
+#                           network/libORXnet.a \
+#                            graphics/spatial_separation/libORXquadtree.a \
+#                            shell/libORXshell.a \
+#                            $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
 
 libORXlibs_a_SOURCES =  coord/p_node.cc \
@@ -76 +77 @@
           shell \
           gui \
+          argp \
           .
 

branches/preferences/src/lib/parser/preferences/cmd_line_prefs_reader.h

@@ -10 +10 @@
 #include "debug.h"
 
-#include <argp.h>
+#include "src/lib/argp/argp.h"
 
 typedef struct {