Changeset 4751 in orxonox.OLD for orxonox/trunk/src/subprojects/collision_detection

Timestamp:

Jul 1, 2005, 6:15:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: all subprojects are ready to be compiled again, with the new ClassList.cc

Location:

orxonox/trunk/src/subprojects/collision_detection

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)

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

@@ -29 +29 @@
                    $(MAINSRCDIR)/util/state.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
+                   $(MAINSRCDIR)/lib/lang/class_list.cc \
                    $(MAINSRCDIR)/lib/math/vector.cc \
                    $(MAINSRCDIR)/util/resource_manager.cc \

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

@@ -57 +57 @@
         collision-light.$(OBJEXT) collision-text_engine.$(OBJEXT) \
         collision-graphics_engine.$(OBJEXT) collision-state.$(OBJEXT) \
-        collision-base_object.$(OBJEXT) collision-vector.$(OBJEXT) \
+        collision-base_object.$(OBJEXT) collision-class_list.$(OBJEXT) \
+        collision-vector.$(OBJEXT) \
         collision-resource_manager.$(OBJEXT) \
         collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \
@@ -82 +83 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/collision-base_object.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/collision-camera.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/collision-class_list.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/collision-collision_detection.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/collision-environment.Po \
@@ -241 +243 @@
                    $(MAINSRCDIR)/util/state.cc \
                    $(MAINSRCDIR)/lib/lang/base_object.cc \
+                   $(MAINSRCDIR)/lib/lang/class_list.cc \
                    $(MAINSRCDIR)/lib/math/vector.cc \
                    $(MAINSRCDIR)/util/resource_manager.cc \
@@ -325 +328 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-camera.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-class_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
@@ -535 +539 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
+
+collision-class_list.o: $(MAINSRCDIR)/lib/lang/class_list.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-class_list.o -MD -MP -MF "$(DEPDIR)/collision-class_list.Tpo" -c -o collision-class_list.o `test -f '$(MAINSRCDIR)/lib/lang/class_list.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/class_list.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-class_list.Tpo" "$(DEPDIR)/collision-class_list.Po"; else rm -f "$(DEPDIR)/collision-class_list.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/class_list.cc' object='collision-class_list.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-class_list.Po' tmpdepfile='$(DEPDIR)/collision-class_list.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-class_list.o `test -f '$(MAINSRCDIR)/lib/lang/class_list.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/lang/class_list.cc
+
+collision-class_list.obj: $(MAINSRCDIR)/lib/lang/class_list.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-class_list.obj -MD -MP -MF "$(DEPDIR)/collision-class_list.Tpo" -c -o collision-class_list.obj `if test -f '$(MAINSRCDIR)/lib/lang/class_list.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/class_list.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/class_list.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-class_list.Tpo" "$(DEPDIR)/collision-class_list.Po"; else rm -f "$(DEPDIR)/collision-class_list.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/lang/class_list.cc' object='collision-class_list.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-class_list.Po' tmpdepfile='$(DEPDIR)/collision-class_list.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-class_list.obj `if test -f '$(MAINSRCDIR)/lib/lang/class_list.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/class_list.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/class_list.cc'; fi`
 
 collision-vector.o: $(MAINSRCDIR)/lib/math/vector.cc