Changeset 3302 in orxonox.OLD for orxonox/branches/parenting/src/Makefile.in

Timestamp:

Dec 27, 2004, 9:31:52 PM (20 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: implemented parenting and added to framework. sill got some problems with how to pass events through the new entity list (now part of the parenting-framework). changed to a more accurate way of coordinat-ing, the openGL coord-orientation. therefore the world is realy strange because it flies into the wrong direction.

File:

• orxonox/branches/parenting/src/Makefile.in (modified) (5 diffs)

orxonox/branches/parenting/src/Makefile.in

@@ -61 +61 @@
         environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
         material.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT) \
-        null_parent.$(OBJEXT)
+        null_parent.$(OBJEXT) base_object.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -68 +68 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
@@ -220 +221 @@
                  list.cc \
                  p_node.cc \
-                 null_parent.cc
+                 null_parent.cc \
+                 base_object.cc 
 
 noinst_HEADERS = ability.h \
@@ -255 +257 @@
                  campaign.h \
                  p_node.h \
-                 null_parent.h
+                 null_parent.h \
+                 base_object.h
 
 EXTRA_DIST = orxonox.conf
@@ -335 +338 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@