Changeset 3470 in orxonox.OLD

Timestamp:

Mar 10, 2005, 2:00:10 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved player to a subfolder named world_entity, and reorganized it in the Makefile.am

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (5 diffs)
• console/Makefile.in (modified) (1 diff)
• gui/Makefile.in (modified) (1 diff)
• importer/Makefile.in (modified) (1 diff)
• world_entity (added)
• world_entity/player.cc (moved) (moved from orxonox/trunk/src/player.cc)
• world_entity/player.h (moved) (moved from orxonox/trunk/src/player.h)

orxonox/trunk/src/Makefile.am

@@ -1 @@
-#AM_CXXFLAGS=""
+AM_CXXFLAGS="-I./world_entity"
 AM_LDFLAGS= $(MWINDOWS)
 
@@ -9 +9 @@
 orxonox_SOURCES= orxonox.cc \
                  world.cc \
-                 player.cc \
+                 world_entity/player.cc \
                  collision.cc \
                  data_tank.cc \
@@ -53 +53 @@
                  base_entity.h \
                  error.h \
-                 player.h \
+                 world_entity/player.h \
                  camera.h \
                  ini_parser.h \

orxonox/trunk/src/Makefile.in

@@ -214 +214 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-
-#AM_CXXFLAGS=""
+AM_CXXFLAGS = "-I./world_entity"
 AM_LDFLAGS = $(MWINDOWS)
 orxonox_SOURCES = orxonox.cc \
                  world.cc \
-                 player.cc \
+                 world_entity/player.cc \
                  collision.cc \
                  data_tank.cc \
@@ -263 +262 @@
                  base_entity.h \
                  error.h \
-                 player.h \
+                 world_entity/player.h \
                  camera.h \
                  ini_parser.h \
@@ -321 +320 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -423 +422 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+player.o: world_entity/player.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.o -MD -MP -MF "$(DEPDIR)/player.Tpo" -c -o player.o `test -f 'world_entity/player.cc' || echo '$(srcdir)/'`world_entity/player.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/player.Tpo" "$(DEPDIR)/player.Po"; else rm -f "$(DEPDIR)/player.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entity/player.cc' object='player.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/player.Po' tmpdepfile='$(DEPDIR)/player.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.o `test -f 'world_entity/player.cc' || echo '$(srcdir)/'`world_entity/player.cc
+
+player.obj: world_entity/player.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT player.obj -MD -MP -MF "$(DEPDIR)/player.Tpo" -c -o player.obj `if test -f 'world_entity/player.cc'; then $(CYGPATH_W) 'world_entity/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entity/player.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/player.Tpo" "$(DEPDIR)/player.Po"; else rm -f "$(DEPDIR)/player.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='world_entity/player.cc' object='player.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/player.Po' tmpdepfile='$(DEPDIR)/player.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.obj `if test -f 'world_entity/player.cc'; then $(CYGPATH_W) 'world_entity/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entity/player.cc'; fi`
 
 model.o: importer/model.cc
@@ -642 +657 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/sfont
+        $(mkdir_p) $(distdir)/sfont $(distdir)/world_entity
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

orxonox/trunk/src/console/Makefile.in

@@ -203 +203 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/console/Makefile
+          $(AUTOMAKE) --gnu  src/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/gui/Makefile.in

@@ -234 +234 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/gui/Makefile
+          $(AUTOMAKE) --gnu  src/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/trunk/src/importer/Makefile.in

@@ -215 +215 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/importer/Makefile
+          $(AUTOMAKE) --gnu  src/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status