Changeset 3476 in orxonox.OLD
- Timestamp:
- Mar 10, 2005, 7:13:47 PM (19 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 2 added
- 2 edited
- 8 moved
-
Makefile.am (modified) (5 diffs)
-
Makefile.in (modified) (7 diffs)
-
glmenu (added)
-
glmenu/glmenu_imagescreen.cc (moved) (moved from orxonox/trunk/src/glmenu_imagescreen.cc)
-
glmenu/glmenu_imagescreen.h (moved) (moved from orxonox/trunk/src/glmenu_imagescreen.h)
-
network (added)
-
network/synchronisable.cc (moved) (moved from orxonox/trunk/src/synchronisable.cc)
-
network/synchronisable.h (moved) (moved from orxonox/trunk/src/synchronisable.h)
-
world_entities/shoot_laser.cc (moved) (moved from orxonox/trunk/src/shoot_laser.cc)
-
world_entities/shoot_laser.h (moved) (moved from orxonox/trunk/src/shoot_laser.h)
-
world_entities/shoot_rocket.cc (moved) (moved from orxonox/trunk/src/shoot_rocket.cc)
-
world_entities/shoot_rocket.h (moved) (moved from orxonox/trunk/src/shoot_rocket.h)
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/Makefile.am
r3475 r3476 5 5 AM_CXXFLAGS+="-I./defs" 6 6 AM_CXXFLAGS+="-I./font" 7 AM_CXXFLAGS+="-I./network" 8 AM_CXXFLAGS+="-I./glmenu" 7 9 8 10 AM_LDFLAGS= $(MWINDOWS) … … 41 43 mathlib/matrix.cc \ 42 44 mathlib/curve.cc \ 43 glmenu _imagescreen.cc \45 glmenu/glmenu_imagescreen.cc \ 44 46 world_entities/skysphere.cc \ 45 47 light.cc \ … … 54 56 world_entities/environment.h \ 55 57 orxonox.h \ 56 synchronisable.h \58 network/synchronisable.h \ 57 59 base_entity.h \ 58 60 defs/error.h \ … … 67 69 command_node.h \ 68 70 lib/list.h \ 69 shoot_laser.h \71 world_entities/shoot_laser.h \ 70 72 world_entities/world_entity.h \ 71 73 message_structures.h \ 72 shoot_rocket.h \74 world_entities/shoot_rocket.h \ 73 75 lib/list_template.h \ 74 76 story_entities/story_entity.h \ … … 83 85 mathlib/matrix.h \ 84 86 mathlib/curve.h \ 85 glmenu _imagescreen.h \87 glmenu/glmenu_imagescreen.h \ 86 88 defs/debug.h \ 87 89 world_entities/skysphere.h \ -
orxonox/trunk/src/Makefile.in
r3475 r3476 214 214 target_os = @target_os@ 215 215 target_vendor = @target_vendor@ 216 AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib" "-I./lib" "-I./defs" "-I./font" 216 AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" "-I./mathlib" "-I./lib" "-I./defs" "-I./font" "-I./network" "-I./glmenu" 217 217 AM_LDFLAGS = $(MWINDOWS) 218 218 orxonox_SOURCES = orxonox.cc \ … … 244 244 mathlib/matrix.cc \ 245 245 mathlib/curve.cc \ 246 glmenu _imagescreen.cc \246 glmenu/glmenu_imagescreen.cc \ 247 247 world_entities/skysphere.cc \ 248 248 light.cc \ … … 257 257 world_entities/environment.h \ 258 258 orxonox.h \ 259 synchronisable.h \259 network/synchronisable.h \ 260 260 base_entity.h \ 261 261 defs/error.h \ … … 270 270 command_node.h \ 271 271 lib/list.h \ 272 shoot_laser.h \272 world_entities/shoot_laser.h \ 273 273 world_entities/world_entity.h \ 274 274 message_structures.h \ 275 shoot_rocket.h \275 world_entities/shoot_rocket.h \ 276 276 lib/list_template.h \ 277 277 story_entities/story_entity.h \ … … 286 286 mathlib/matrix.h \ 287 287 mathlib/curve.h \ 288 glmenu _imagescreen.h \288 glmenu/glmenu_imagescreen.h \ 289 289 defs/debug.h \ 290 290 world_entities/skysphere.h \ … … 675 675 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 676 676 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curve.obj `if test -f 'mathlib/curve.cc'; then $(CYGPATH_W) 'mathlib/curve.cc'; else $(CYGPATH_W) '$(srcdir)/mathlib/curve.cc'; fi` 677 678 glmenu_imagescreen.o: glmenu/glmenu_imagescreen.cc 679 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glmenu_imagescreen.o -MD -MP -MF "$(DEPDIR)/glmenu_imagescreen.Tpo" -c -o glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc; \ 680 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/glmenu_imagescreen.Tpo" "$(DEPDIR)/glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/glmenu_imagescreen.Tpo"; exit 1; fi 681 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='glmenu/glmenu_imagescreen.cc' object='glmenu_imagescreen.o' libtool=no @AMDEPBACKSLASH@ 682 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/glmenu_imagescreen.TPo' @AMDEPBACKSLASH@ 683 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 684 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.o `test -f 'glmenu/glmenu_imagescreen.cc' || echo '$(srcdir)/'`glmenu/glmenu_imagescreen.cc 685 686 glmenu_imagescreen.obj: glmenu/glmenu_imagescreen.cc 687 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT glmenu_imagescreen.obj -MD -MP -MF "$(DEPDIR)/glmenu_imagescreen.Tpo" -c -o glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi`; \ 688 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/glmenu_imagescreen.Tpo" "$(DEPDIR)/glmenu_imagescreen.Po"; else rm -f "$(DEPDIR)/glmenu_imagescreen.Tpo"; exit 1; fi 689 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='glmenu/glmenu_imagescreen.cc' object='glmenu_imagescreen.obj' libtool=no @AMDEPBACKSLASH@ 690 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/glmenu_imagescreen.Po' tmpdepfile='$(DEPDIR)/glmenu_imagescreen.TPo' @AMDEPBACKSLASH@ 691 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 692 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o glmenu_imagescreen.obj `if test -f 'glmenu/glmenu_imagescreen.cc'; then $(CYGPATH_W) 'glmenu/glmenu_imagescreen.cc'; else $(CYGPATH_W) '$(srcdir)/glmenu/glmenu_imagescreen.cc'; fi` 677 693 678 694 skysphere.o: world_entities/skysphere.cc … … 830 846 831 847 distdir: $(DISTFILES) 832 $(mkdir_p) $(distdir)/defs $(distdir)/font $(distdir)/ lib $(distdir)/mathlib$(distdir)/story_entities $(distdir)/world_entities848 $(mkdir_p) $(distdir)/defs $(distdir)/font $(distdir)/glmenu $(distdir)/lib $(distdir)/mathlib $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities 833 849 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 834 850 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset
for help on using the changeset viewer.
