Changeset 4572 in orxonox.OLD for orxonox/trunk/src/subprojects

Timestamp:

Jun 10, 2005, 1:17:13 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: newmat lib now works with cd and cd-subproject

Location:

orxonox/trunk/src/subprojects/collision_detection

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (4 diffs)

orxonox/trunk/src/subprojects/collision_detection/Makefile.am

@@ -10 +10 @@
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                  $(MAINSRCDIR)/lib/newmat/libnewmat.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
                   -lpthread
@@ -37 +38 @@
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/newmat/include.h \
+                   $(MAINSRCDIR)/lib/newmat/newmat.h \
+                   $(MAINSRCDIR)/lib/newmat/newmatap.h \
+                   $(MAINSRCDIR)/lib/newmatio.h

orxonox/trunk/src/subprojects/collision_detection/Makefile.in

@@ -71 +71 @@
         $(MAINSRCDIR)/lib/event/libORXevent.a \
         $(MAINSRCDIR)/lib/sound/libORXsound.a \
-        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a $(am__DEPENDENCIES_1) \
+        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+        $(MAINSRCDIR)/lib/newmat/libnewmat.a $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -103 +104 @@
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
         -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(collision_SOURCES)
 DIST_SOURCES = $(collision_SOURCES)
@@ -222 +227 @@
                   $(MAINSRCDIR)/lib/sound/libORXsound.a \
                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                  $(MAINSRCDIR)/lib/newmat/libnewmat.a \
                   $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
                   -lpthread
@@ -249 +255 @@
                    $(MAINSRCDIR)/lib/coord/p_node.cc \
                    $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc
+                   $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
+                   $(MAINSRCDIR)/lib/newmat/include.h \
+                   $(MAINSRCDIR)/lib/newmat/newmat.h \
+                   $(MAINSRCDIR)/lib/newmat/newmatap.h \
+                   $(MAINSRCDIR)/lib/newmatio.h
 
 all: all-am