Changeset 4975 in orxonox.OLD for orxonox/trunk/src/Makefile.in

Timestamp:

Aug 9, 2005, 12:23:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: player should be able to load its preferences from an external file
removed the obsolete ObjectManager that has been redesigned as FastFactory.

File:

• orxonox/trunk/src/Makefile.in (modified) (6 diffs)

orxonox/trunk/src/Makefile.in

@@ -58 +58 @@
         orxonox-animation.$(OBJEXT) orxonox-animation3d.$(OBJEXT) \
         orxonox-animation_player.$(OBJEXT) \
-        orxonox-object_manager.$(OBJEXT) \
         orxonox-fast_factory.$(OBJEXT) \
         orxonox-garbage_collector.$(OBJEXT) \
@@ -110 +109 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-load_param.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-null_parent.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-object_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-p_node.Po \
@@ -294 +292 @@
                   util/animation/animation3d.cc \
                   util/animation/animation_player.cc \
-                  util/object_manager.cc \
                   util/fast_factory.cc \
                   util/garbage_collector.cc \
@@ -348 +345 @@
                  util/animation/animation3d.h \
                  util/animation/animation_player.h \
-                 util/object_manager.h \
                  util/fast_factory.h \
                  util/garbage_collector.h \
@@ -507 +503 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-null_parent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-object_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-p_node.Po@am__quote@
@@ -678 +673 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-animation_player.obj `if test -f 'util/animation/animation_player.cc'; then $(CYGPATH_W) 'util/animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/util/animation/animation_player.cc'; fi`
-
-orxonox-object_manager.o: util/object_manager.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-object_manager.o -MD -MP -MF "$(DEPDIR)/orxonox-object_manager.Tpo" -c -o orxonox-object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-object_manager.Tpo" "$(DEPDIR)/orxonox-object_manager.Po"; else rm -f "$(DEPDIR)/orxonox-object_manager.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/object_manager.cc' object='orxonox-object_manager.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-object_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-object_manager.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-object_manager.o `test -f 'util/object_manager.cc' || echo '$(srcdir)/'`util/object_manager.cc
-
-orxonox-object_manager.obj: util/object_manager.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-object_manager.obj -MD -MP -MF "$(DEPDIR)/orxonox-object_manager.Tpo" -c -o orxonox-object_manager.obj `if test -f 'util/object_manager.cc'; then $(CYGPATH_W) 'util/object_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/object_manager.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-object_manager.Tpo" "$(DEPDIR)/orxonox-object_manager.Po"; else rm -f "$(DEPDIR)/orxonox-object_manager.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/object_manager.cc' object='orxonox-object_manager.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-object_manager.Po' tmpdepfile='$(DEPDIR)/orxonox-object_manager.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-object_manager.obj `if test -f 'util/object_manager.cc'; then $(CYGPATH_W) 'util/object_manager.cc'; else $(CYGPATH_W) '$(srcdir)/util/object_manager.cc'; fi`
 
 orxonox-fast_factory.o: util/fast_factory.cc