Changeset 3471 in orxonox.OLD

Timestamp:

Mar 10, 2005, 4:45:45 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: redesigning directory structure - first step

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (4 diffs)
• world_entities (added)
• world_entities/player.cc (added)
• world_entities/player.h (added)
• world_entity (deleted)

orxonox/trunk/src/Makefile.am

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

orxonox/trunk/src/Makefile.in

@@ -214 +214 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
-AM_CXXFLAGS = "-I./world_entity"
+AM_CXXFLAGS = "-I./world_entities"
 AM_LDFLAGS = $(MWINDOWS)
 orxonox_SOURCES = orxonox.cc \
                  world.cc \
-                 world_entity/player.cc \
+                 world_entities/player.cc \
                  collision.cc \
                  data_tank.cc \
@@ -262 +262 @@
                  base_entity.h \
                  error.h \
-                 world_entity/player.h \
+                 world_entities/player.h \
                  camera.h \
                  ini_parser.h \
@@ -423 +423 @@
 @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; \
+player.o: world_entities/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_entities/player.cc' || echo '$(srcdir)/'`world_entities/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@      source='world_entities/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_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.o `test -f 'world_entities/player.cc' || echo '$(srcdir)/'`world_entities/player.cc
+
+player.obj: world_entities/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_entities/player.cc'; then $(CYGPATH_W) 'world_entities/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/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@      source='world_entities/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`
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o player.obj `if test -f 'world_entities/player.cc'; then $(CYGPATH_W) 'world_entities/player.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/player.cc'; fi`
 
 model.o: importer/model.cc
@@ -657 +657 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/sfont $(distdir)/world_entity
+        $(mkdir_p) $(distdir)/sfont $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \