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

Timestamp:

Sep 27, 2005, 4:10:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shaders now work

File:

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

trunk/src/Makefile.in

@@ -66 +66 @@
         orxonox-world_entity.$(OBJEXT) orxonox-camera.$(OBJEXT) \
         orxonox-player.$(OBJEXT) orxonox-npc.$(OBJEXT) \
-        orxonox-environment.$(OBJEXT) orxonox-skysphere.$(OBJEXT) \
-        orxonox-skybox.$(OBJEXT) orxonox-terrain.$(OBJEXT) \
-        orxonox-satellite.$(OBJEXT) \
+        orxonox-npc2.$(OBJEXT) orxonox-environment.$(OBJEXT) \
+        orxonox-skysphere.$(OBJEXT) orxonox-skybox.$(OBJEXT) \
+        orxonox-terrain.$(OBJEXT) orxonox-satellite.$(OBJEXT) \
         orxonox-character_attributes.$(OBJEXT) \
         orxonox-test_entity.$(OBJEXT) orxonox-weapon_manager.$(OBJEXT) \
@@ -114 +114 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-load_param.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-npc2.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-null_parent.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-orxonox.Po \
@@ -316 +317 @@
                   world_entities/player.cc \
                   world_entities/npc.cc \
+                  world_entities/npc2.cc \
                   world_entities/environment.cc \
                   world_entities/skysphere.cc \
@@ -375 +377 @@
                  world_entities/player.h \
                  world_entities/npc.h \
+                 world_entities/npc2.h \
                  world_entities/environment.h \
                  world_entities/skysphere.h \
@@ -526 +529 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-npc2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-orxonox.Po@am__quote@
@@ -923 +927 @@
 @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-npc.obj `if test -f 'world_entities/npc.cc'; then $(CYGPATH_W) 'world_entities/npc.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc.cc'; fi`
+
+orxonox-npc2.o: world_entities/npc2.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc2.o -MD -MP -MF "$(DEPDIR)/orxonox-npc2.Tpo" -c -o orxonox-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc2.cc' object='orxonox-npc2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc2.Po' tmpdepfile='$(DEPDIR)/orxonox-npc2.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-npc2.o `test -f 'world_entities/npc2.cc' || echo '$(srcdir)/'`world_entities/npc2.cc
+
+orxonox-npc2.obj: world_entities/npc2.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-npc2.obj -MD -MP -MF "$(DEPDIR)/orxonox-npc2.Tpo" -c -o orxonox-npc2.obj `if test -f 'world_entities/npc2.cc'; then $(CYGPATH_W) 'world_entities/npc2.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc2.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-npc2.Tpo" "$(DEPDIR)/orxonox-npc2.Po"; else rm -f "$(DEPDIR)/orxonox-npc2.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entities/npc2.cc' object='orxonox-npc2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-npc2.Po' tmpdepfile='$(DEPDIR)/orxonox-npc2.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-npc2.obj `if test -f 'world_entities/npc2.cc'; then $(CYGPATH_W) 'world_entities/npc2.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/npc2.cc'; fi`
 
 orxonox-environment.o: world_entities/environment.cc