Changeset 5597 in orxonox.OLD for branches/world_entities/src
- Timestamp:
- Nov 16, 2005, 2:36:20 PM (19 years ago)
- Location:
- branches/world_entities/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/world_entities/src/Makefile.in
r5558 r5597 67 67 orxonox-aiming_turret.$(OBJEXT) orxonox-test_bullet.$(OBJEXT) \ 68 68 orxonox-rocket.$(OBJEXT) orxonox-laser.$(OBJEXT) \ 69 orxonox-aim.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \ 70 orxonox-power_up.$(OBJEXT) orxonox-turret_power_up.$(OBJEXT) \ 69 orxonox-aim.$(OBJEXT) orxonox-bomb.$(OBJEXT) \ 70 orxonox-crosshair.$(OBJEXT) orxonox-power_up.$(OBJEXT) \ 71 orxonox-turret_power_up.$(OBJEXT) \ 71 72 orxonox-laser_power_up.$(OBJEXT) orxonox-benchmark.$(OBJEXT) 72 73 orxonox_OBJECTS = $(am_orxonox_OBJECTS) … … 262 263 world_entities/weapons/laser.cc \ 263 264 world_entities/weapons/aim.cc \ 265 world_entities/weapons/bomb.cc \ 264 266 world_entities/weapons/crosshair.cc \ 265 267 world_entities/power_ups/power_up.cc \ … … 297 299 world_entities/weapons/laser.h \ 298 300 world_entities/weapons/aim.h \ 301 world_entities/weapons/bomb.h \ 299 302 world_entities/weapons/crosshair.h \ 300 303 world_entities/power_ups/power_up.h \ … … 400 403 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-aiming_turret.Po@am__quote@ 401 404 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-benchmark.Po@am__quote@ 405 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-bomb.Po@am__quote@ 402 406 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-camera.Po@am__quote@ 403 407 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-campaign.Po@am__quote@ … … 806 810 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 807 811 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-aim.obj `if test -f 'world_entities/weapons/aim.cc'; then $(CYGPATH_W) 'world_entities/weapons/aim.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/aim.cc'; fi` 812 813 orxonox-bomb.o: world_entities/weapons/bomb.cc 814 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-bomb.o -MD -MP -MF "$(DEPDIR)/orxonox-bomb.Tpo" -c -o orxonox-bomb.o `test -f 'world_entities/weapons/bomb.cc' || echo '$(srcdir)/'`world_entities/weapons/bomb.cc; \ 815 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-bomb.Tpo" "$(DEPDIR)/orxonox-bomb.Po"; else rm -f "$(DEPDIR)/orxonox-bomb.Tpo"; exit 1; fi 816 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/weapons/bomb.cc' object='orxonox-bomb.o' libtool=no @AMDEPBACKSLASH@ 817 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 818 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-bomb.o `test -f 'world_entities/weapons/bomb.cc' || echo '$(srcdir)/'`world_entities/weapons/bomb.cc 819 820 orxonox-bomb.obj: world_entities/weapons/bomb.cc 821 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-bomb.obj -MD -MP -MF "$(DEPDIR)/orxonox-bomb.Tpo" -c -o orxonox-bomb.obj `if test -f 'world_entities/weapons/bomb.cc'; then $(CYGPATH_W) 'world_entities/weapons/bomb.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/bomb.cc'; fi`; \ 822 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-bomb.Tpo" "$(DEPDIR)/orxonox-bomb.Po"; else rm -f "$(DEPDIR)/orxonox-bomb.Tpo"; exit 1; fi 823 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/weapons/bomb.cc' object='orxonox-bomb.obj' libtool=no @AMDEPBACKSLASH@ 824 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 825 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-bomb.obj `if test -f 'world_entities/weapons/bomb.cc'; then $(CYGPATH_W) 'world_entities/weapons/bomb.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/bomb.cc'; fi` 808 826 809 827 orxonox-crosshair.o: world_entities/weapons/crosshair.cc -
branches/world_entities/src/subprojects/importer/Makefile.am
r5558 r5597 31 31 $(MAINSRCDIR)/lib/util/substring.cc \ 32 32 $(MAINSRCDIR)/lib/util/color.cc \ 33 $(MAINSRCDIR)/lib/util/multi_type.cc \ 33 34 $(MAINSRCDIR)/util/loading/factory.cc -
branches/world_entities/src/subprojects/importer/Makefile.in
r5558 r5597 61 61 importer-helper_functions.$(OBJEXT) \ 62 62 importer-substring.$(OBJEXT) importer-color.$(OBJEXT) \ 63 importer- factory.$(OBJEXT)63 importer-multi_type.$(OBJEXT) importer-factory.$(OBJEXT) 64 64 importer_OBJECTS = $(am_importer_OBJECTS) 65 65 importer_DEPENDENCIES = $(MAINSRCDIR)/lib/event/libORXevent.a \ … … 218 218 $(MAINSRCDIR)/lib/util/substring.cc \ 219 219 $(MAINSRCDIR)/lib/util/color.cc \ 220 $(MAINSRCDIR)/lib/util/multi_type.cc \ 220 221 $(MAINSRCDIR)/util/loading/factory.cc 221 222 … … 297 298 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-load_param.Po@am__quote@ 298 299 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-load_param_description.Po@am__quote@ 300 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-multi_type.Po@am__quote@ 299 301 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-null_parent.Po@am__quote@ 300 302 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-p_node.Po@am__quote@ … … 541 543 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 542 544 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi` 545 546 importer-multi_type.o: $(MAINSRCDIR)/lib/util/multi_type.cc 547 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-multi_type.o -MD -MP -MF "$(DEPDIR)/importer-multi_type.Tpo" -c -o importer-multi_type.o `test -f '$(MAINSRCDIR)/lib/util/multi_type.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/multi_type.cc; \ 548 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/importer-multi_type.Tpo" "$(DEPDIR)/importer-multi_type.Po"; else rm -f "$(DEPDIR)/importer-multi_type.Tpo"; exit 1; fi 549 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/lib/util/multi_type.cc' object='importer-multi_type.o' libtool=no @AMDEPBACKSLASH@ 550 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 551 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-multi_type.o `test -f '$(MAINSRCDIR)/lib/util/multi_type.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/multi_type.cc 552 553 importer-multi_type.obj: $(MAINSRCDIR)/lib/util/multi_type.cc 554 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-multi_type.obj -MD -MP -MF "$(DEPDIR)/importer-multi_type.Tpo" -c -o importer-multi_type.obj `if test -f '$(MAINSRCDIR)/lib/util/multi_type.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/multi_type.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/multi_type.cc'; fi`; \ 555 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/importer-multi_type.Tpo" "$(DEPDIR)/importer-multi_type.Po"; else rm -f "$(DEPDIR)/importer-multi_type.Tpo"; exit 1; fi 556 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$(MAINSRCDIR)/lib/util/multi_type.cc' object='importer-multi_type.obj' libtool=no @AMDEPBACKSLASH@ 557 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 558 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-multi_type.obj `if test -f '$(MAINSRCDIR)/lib/util/multi_type.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/multi_type.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/multi_type.cc'; fi` 543 559 544 560 importer-factory.o: $(MAINSRCDIR)/util/loading/factory.cc
Note: See TracChangeset
for help on using the changeset viewer.