Changeset 3472 in orxonox.OLD for orxonox/trunk/src
- Timestamp:
- Mar 10, 2005, 5:12:46 PM (20 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 1 added
- 2 edited
- 11 moved
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/Makefile.am
r3471 r3472 1 1 AM_CXXFLAGS="-I./world_entities" 2 AM_CXXFLAGS+="-I./story_entities" 3 2 4 AM_LDFLAGS= $(MWINDOWS) 3 5 … … 12 14 collision.cc \ 13 15 data_tank.cc \ 14 world_entit y.cc \16 world_entities/world_entity.cc \ 15 17 vector.cc \ 16 18 camera.cc \ … … 20 22 base_entity.cc \ 21 23 game_loader.cc \ 22 campaign.cc \23 story_entit y.cc \24 environment.cc \24 story_entities/campaign.cc \ 25 story_entities/story_entity.cc \ 26 world_entities/environment.cc \ 25 27 importer/model.cc \ 26 28 importer/objModel.cc \ … … 44 46 data_tank.h \ 45 47 collision.h \ 46 npc.h \48 world_entities/npc.h \ 47 49 stdincl.h \ 48 50 glincl.h \ 49 51 ai.h \ 50 environment.h \52 world_entities/environment.h \ 51 53 orxonox.h \ 52 54 synchronisable.h \ … … 64 66 list.h \ 65 67 shoot_laser.h \ 66 world_entit y.h \68 world_entities/world_entity.h \ 67 69 message_structures.h \ 68 70 shoot_rocket.h \ 69 71 list_template.h \ 70 story_entit y.h \71 story_ def.h \72 story_entities/story_entity.h \ 73 story_entities/story_def.h \ 72 74 game_loader.h \ 73 campaign.h \75 story_entities/campaign.h \ 74 76 p_node.h \ 75 77 null_parent.h \ -
orxonox/trunk/src/Makefile.in
r3471 r3472 214 214 target_os = @target_os@ 215 215 target_vendor = @target_vendor@ 216 AM_CXXFLAGS = "-I./world_entities" 216 AM_CXXFLAGS = "-I./world_entities" "-I./story_entities" 217 217 AM_LDFLAGS = $(MWINDOWS) 218 218 orxonox_SOURCES = orxonox.cc \ … … 221 221 collision.cc \ 222 222 data_tank.cc \ 223 world_entit y.cc \223 world_entities/world_entity.cc \ 224 224 vector.cc \ 225 225 camera.cc \ … … 229 229 base_entity.cc \ 230 230 game_loader.cc \ 231 campaign.cc \232 story_entit y.cc \233 environment.cc \231 story_entities/campaign.cc \ 232 story_entities/story_entity.cc \ 233 world_entities/environment.cc \ 234 234 importer/model.cc \ 235 235 importer/objModel.cc \ … … 253 253 data_tank.h \ 254 254 collision.h \ 255 npc.h \255 world_entities/npc.h \ 256 256 stdincl.h \ 257 257 glincl.h \ 258 258 ai.h \ 259 environment.h \259 world_entities/environment.h \ 260 260 orxonox.h \ 261 261 synchronisable.h \ … … 273 273 list.h \ 274 274 shoot_laser.h \ 275 world_entit y.h \275 world_entities/world_entity.h \ 276 276 message_structures.h \ 277 277 shoot_rocket.h \ 278 278 list_template.h \ 279 story_entit y.h \280 story_ def.h \279 story_entities/story_entity.h \ 280 story_entities/story_def.h \ 281 281 game_loader.h \ 282 campaign.h \282 story_entities/campaign.h \ 283 283 p_node.h \ 284 284 null_parent.h \ … … 438 438 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 439 439 @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` 440 441 world_entity.o: world_entities/world_entity.cc 442 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT world_entity.o -MD -MP -MF "$(DEPDIR)/world_entity.Tpo" -c -o world_entity.o `test -f 'world_entities/world_entity.cc' || echo '$(srcdir)/'`world_entities/world_entity.cc; \ 443 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/world_entity.Tpo" "$(DEPDIR)/world_entity.Po"; else rm -f "$(DEPDIR)/world_entity.Tpo"; exit 1; fi 444 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/world_entity.cc' object='world_entity.o' libtool=no @AMDEPBACKSLASH@ 445 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/world_entity.Po' tmpdepfile='$(DEPDIR)/world_entity.TPo' @AMDEPBACKSLASH@ 446 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 447 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world_entity.o `test -f 'world_entities/world_entity.cc' || echo '$(srcdir)/'`world_entities/world_entity.cc 448 449 world_entity.obj: world_entities/world_entity.cc 450 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT world_entity.obj -MD -MP -MF "$(DEPDIR)/world_entity.Tpo" -c -o world_entity.obj `if test -f 'world_entities/world_entity.cc'; then $(CYGPATH_W) 'world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/world_entity.cc'; fi`; \ 451 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/world_entity.Tpo" "$(DEPDIR)/world_entity.Po"; else rm -f "$(DEPDIR)/world_entity.Tpo"; exit 1; fi 452 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/world_entity.cc' object='world_entity.obj' libtool=no @AMDEPBACKSLASH@ 453 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/world_entity.Po' tmpdepfile='$(DEPDIR)/world_entity.TPo' @AMDEPBACKSLASH@ 454 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 455 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o world_entity.obj `if test -f 'world_entities/world_entity.cc'; then $(CYGPATH_W) 'world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/world_entity.cc'; fi` 456 457 campaign.o: story_entities/campaign.cc 458 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT campaign.o -MD -MP -MF "$(DEPDIR)/campaign.Tpo" -c -o campaign.o `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc; \ 459 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/campaign.Tpo" "$(DEPDIR)/campaign.Po"; else rm -f "$(DEPDIR)/campaign.Tpo"; exit 1; fi 460 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='story_entities/campaign.cc' object='campaign.o' libtool=no @AMDEPBACKSLASH@ 461 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/campaign.Po' tmpdepfile='$(DEPDIR)/campaign.TPo' @AMDEPBACKSLASH@ 462 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 463 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o campaign.o `test -f 'story_entities/campaign.cc' || echo '$(srcdir)/'`story_entities/campaign.cc 464 465 campaign.obj: story_entities/campaign.cc 466 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT campaign.obj -MD -MP -MF "$(DEPDIR)/campaign.Tpo" -c -o campaign.obj `if test -f 'story_entities/campaign.cc'; then $(CYGPATH_W) 'story_entities/campaign.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/campaign.cc'; fi`; \ 467 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/campaign.Tpo" "$(DEPDIR)/campaign.Po"; else rm -f "$(DEPDIR)/campaign.Tpo"; exit 1; fi 468 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='story_entities/campaign.cc' object='campaign.obj' libtool=no @AMDEPBACKSLASH@ 469 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/campaign.Po' tmpdepfile='$(DEPDIR)/campaign.TPo' @AMDEPBACKSLASH@ 470 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 471 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o campaign.obj `if test -f 'story_entities/campaign.cc'; then $(CYGPATH_W) 'story_entities/campaign.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/campaign.cc'; fi` 472 473 story_entity.o: story_entities/story_entity.cc 474 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT story_entity.o -MD -MP -MF "$(DEPDIR)/story_entity.Tpo" -c -o story_entity.o `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc; \ 475 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/story_entity.Tpo" "$(DEPDIR)/story_entity.Po"; else rm -f "$(DEPDIR)/story_entity.Tpo"; exit 1; fi 476 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='story_entities/story_entity.cc' object='story_entity.o' libtool=no @AMDEPBACKSLASH@ 477 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/story_entity.Po' tmpdepfile='$(DEPDIR)/story_entity.TPo' @AMDEPBACKSLASH@ 478 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 479 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o story_entity.o `test -f 'story_entities/story_entity.cc' || echo '$(srcdir)/'`story_entities/story_entity.cc 480 481 story_entity.obj: story_entities/story_entity.cc 482 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT story_entity.obj -MD -MP -MF "$(DEPDIR)/story_entity.Tpo" -c -o story_entity.obj `if test -f 'story_entities/story_entity.cc'; then $(CYGPATH_W) 'story_entities/story_entity.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/story_entity.cc'; fi`; \ 483 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/story_entity.Tpo" "$(DEPDIR)/story_entity.Po"; else rm -f "$(DEPDIR)/story_entity.Tpo"; exit 1; fi 484 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='story_entities/story_entity.cc' object='story_entity.obj' libtool=no @AMDEPBACKSLASH@ 485 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/story_entity.Po' tmpdepfile='$(DEPDIR)/story_entity.TPo' @AMDEPBACKSLASH@ 486 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 487 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o story_entity.obj `if test -f 'story_entities/story_entity.cc'; then $(CYGPATH_W) 'story_entities/story_entity.cc'; else $(CYGPATH_W) '$(srcdir)/story_entities/story_entity.cc'; fi` 488 489 environment.o: world_entities/environment.cc 490 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT environment.o -MD -MP -MF "$(DEPDIR)/environment.Tpo" -c -o environment.o `test -f 'world_entities/environment.cc' || echo '$(srcdir)/'`world_entities/environment.cc; \ 491 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/environment.Tpo" "$(DEPDIR)/environment.Po"; else rm -f "$(DEPDIR)/environment.Tpo"; exit 1; fi 492 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/environment.cc' object='environment.o' libtool=no @AMDEPBACKSLASH@ 493 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/environment.Po' tmpdepfile='$(DEPDIR)/environment.TPo' @AMDEPBACKSLASH@ 494 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 495 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o environment.o `test -f 'world_entities/environment.cc' || echo '$(srcdir)/'`world_entities/environment.cc 496 497 environment.obj: world_entities/environment.cc 498 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT environment.obj -MD -MP -MF "$(DEPDIR)/environment.Tpo" -c -o environment.obj `if test -f 'world_entities/environment.cc'; then $(CYGPATH_W) 'world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/environment.cc'; fi`; \ 499 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/environment.Tpo" "$(DEPDIR)/environment.Po"; else rm -f "$(DEPDIR)/environment.Tpo"; exit 1; fi 500 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/environment.cc' object='environment.obj' libtool=no @AMDEPBACKSLASH@ 501 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/environment.Po' tmpdepfile='$(DEPDIR)/environment.TPo' @AMDEPBACKSLASH@ 502 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 503 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o environment.obj `if test -f 'world_entities/environment.cc'; then $(CYGPATH_W) 'world_entities/environment.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/environment.cc'; fi` 440 504 441 505 model.o: importer/model.cc … … 657 721 658 722 distdir: $(DISTFILES) 659 $(mkdir_p) $(distdir)/sfont $(distdir)/ world_entities723 $(mkdir_p) $(distdir)/sfont $(distdir)/story_entities $(distdir)/world_entities 660 724 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 661 725 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset
for help on using the changeset viewer.