Changeset 3525 in orxonox.OLD for orxonox/branches/levelloader/src
- Timestamp:
- Mar 13, 2005, 6:59:20 PM (20 years ago)
- Location:
- orxonox/branches/levelloader/src
- Files:
-
- 9 added
- 3 deleted
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/levelloader/src/Makefile.am
r3499 r3525 13 13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util 14 14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math 15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/xmlparser 15 16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs 16 17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font … … 34 35 track_manager.cc \ 35 36 light.cc \ 37 factory.cc \ 36 38 story_entities/story_entity.cc \ 37 39 story_entities/campaign.cc \ … … 56 58 lib/util/ini_parser.cc \ 57 59 lib/util/list.cc \ 60 lib/util/substring.cc \ 58 61 lib/math/vector.cc \ 59 62 lib/math/matrix.cc \ 60 63 lib/math/curve.cc \ 64 lib/xmlparser/tinystr.cc \ 65 lib/xmlparser/tinyxml.cc \ 66 lib/xmlparser/tinyxmlerror.cc \ 67 lib/xmlparser/tinyxmlparser.cc \ 61 68 glmenu/glmenu_imagescreen.cc 62 69 … … 64 71 game_loader.h \ 65 72 track_manager.h \ 66 73 ability.h \ 67 74 camera.h \ 68 75 keynames.h \ … … 99 106 lib/util/list_template.h \ 100 107 lib/util/ini_parser.h \ 108 lib/util/substring.h \ 109 lib/xmlparser/tinyxml.h \ 110 lib/xmlparser/tinystr.h \ 101 111 lib/math/vector.h \ 102 112 lib/math/matrix.h \ -
orxonox/branches/levelloader/src/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) 55 55 am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \ 56 56 command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \ 57 track_manager.$(OBJEXT) light.$(OBJEXT) story_entity.$(OBJEXT) \ 58 campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \ 59 player.$(OBJEXT) environment.$(OBJEXT) skysphere.$(OBJEXT) \ 60 ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \ 61 helper_parent.$(OBJEXT) data_tank.$(OBJEXT) fontset.$(OBJEXT) \ 62 array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \ 63 material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \ 64 base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \ 57 track_manager.$(OBJEXT) light.$(OBJEXT) factory.$(OBJEXT) \ 58 story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \ 59 world_entity.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \ 60 skysphere.$(OBJEXT) ai.$(OBJEXT) p_node.$(OBJEXT) \ 61 null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \ 62 data_tank.$(OBJEXT) fontset.$(OBJEXT) array.$(OBJEXT) \ 63 objModel.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \ 64 texture.$(OBJEXT) base_entity.$(OBJEXT) base_object.$(OBJEXT) \ 65 ini_parser.$(OBJEXT) list.$(OBJEXT) substring.$(OBJEXT) \ 65 66 vector.$(OBJEXT) matrix.$(OBJEXT) curve.$(OBJEXT) \ 66 glmenu_imagescreen.$(OBJEXT) 67 tinystr.$(OBJEXT) tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \ 68 tinyxmlparser.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) 67 69 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 68 70 orxonox_LDADD = $(LDADD) … … 76 78 @AMDEP_TRUE@ ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \ 77 79 @AMDEP_TRUE@ ./$(DEPDIR)/data_tank.Po \ 78 @AMDEP_TRUE@ ./$(DEPDIR)/environment.Po ./$(DEPDIR)/f ontset.Po \79 @AMDEP_TRUE@ ./$(DEPDIR)/ game_loader.Po \80 @AMDEP_TRUE@ ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \ 81 @AMDEP_TRUE@ ./$(DEPDIR)/fontset.Po ./$(DEPDIR)/game_loader.Po \ 80 82 @AMDEP_TRUE@ ./$(DEPDIR)/glmenu_imagescreen.Po \ 81 83 @AMDEP_TRUE@ ./$(DEPDIR)/helper_parent.Po \ … … 87 89 @AMDEP_TRUE@ ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \ 88 90 @AMDEP_TRUE@ ./$(DEPDIR)/skysphere.Po \ 89 @AMDEP_TRUE@ ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/texture.Po \ 91 @AMDEP_TRUE@ ./$(DEPDIR)/story_entity.Po \ 92 @AMDEP_TRUE@ ./$(DEPDIR)/substring.Po ./$(DEPDIR)/texture.Po \ 93 @AMDEP_TRUE@ ./$(DEPDIR)/tinystr.Po ./$(DEPDIR)/tinyxml.Po \ 94 @AMDEP_TRUE@ ./$(DEPDIR)/tinyxmlerror.Po \ 95 @AMDEP_TRUE@ ./$(DEPDIR)/tinyxmlparser.Po \ 90 96 @AMDEP_TRUE@ ./$(DEPDIR)/track_manager.Po ./$(DEPDIR)/vector.Po \ 91 97 @AMDEP_TRUE@ ./$(DEPDIR)/world.Po ./$(DEPDIR)/world_entity.Po … … 215 221 target_vendor = @target_vendor@ 216 222 MAINSRCDIR = . 217 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/ defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai223 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/xmlparser -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai 218 224 AM_LDFLAGS = $(MWINDOWS) 219 225 orxonox_SOURCES = orxonox.cc \ … … 224 230 track_manager.cc \ 225 231 light.cc \ 232 factory.cc \ 226 233 story_entities/story_entity.cc \ 227 234 story_entities/campaign.cc \ … … 246 253 lib/util/ini_parser.cc \ 247 254 lib/util/list.cc \ 255 lib/util/substring.cc \ 248 256 lib/math/vector.cc \ 249 257 lib/math/matrix.cc \ 250 258 lib/math/curve.cc \ 259 lib/xmlparser/tinystr.cc \ 260 lib/xmlparser/tinyxml.cc \ 261 lib/xmlparser/tinyxmlerror.cc \ 262 lib/xmlparser/tinyxmlparser.cc \ 251 263 glmenu/glmenu_imagescreen.cc 252 264 … … 254 266 game_loader.h \ 255 267 track_manager.h \ 256 268 ability.h \ 257 269 camera.h \ 258 270 keynames.h \ … … 289 301 lib/util/list_template.h \ 290 302 lib/util/ini_parser.h \ 303 lib/util/substring.h \ 304 lib/xmlparser/tinyxml.h \ 305 lib/xmlparser/tinystr.h \ 291 306 lib/math/vector.h \ 292 307 lib/math/matrix.h \ … … 335 350 install-binPROGRAMS: $(bin_PROGRAMS) 336 351 @$(NORMAL_INSTALL) 337 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"352 $(mkdir_p) $(DESTDIR)$(bindir) 338 353 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 339 354 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 341 356 ; then \ 342 357 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 343 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \344 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \358 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 359 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 345 360 else :; fi; \ 346 361 done … … 350 365 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 351 366 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 352 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \353 rm -f "$(DESTDIR)$(bindir)/$$f"; \367 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 368 rm -f $(DESTDIR)$(bindir)/$$f; \ 354 369 done 355 370 … … 376 391 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@ 377 392 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@ 393 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/factory.Po@am__quote@ 378 394 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontset.Po@am__quote@ 379 395 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@ … … 394 410 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@ 395 411 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@ 412 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/substring.Po@am__quote@ 396 413 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@ 414 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinystr.Po@am__quote@ 415 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxml.Po@am__quote@ 416 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlerror.Po@am__quote@ 417 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tinyxmlparser.Po@am__quote@ 397 418 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@ 398 419 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@ … … 768 789 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o list.obj `if test -f 'lib/util/list.cc'; then $(CYGPATH_W) 'lib/util/list.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/list.cc'; fi` 769 790 791 substring.o: lib/util/substring.cc 792 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT substring.o -MD -MP -MF "$(DEPDIR)/substring.Tpo" -c -o substring.o `test -f 'lib/util/substring.cc' || echo '$(srcdir)/'`lib/util/substring.cc; \ 793 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/substring.Tpo" "$(DEPDIR)/substring.Po"; else rm -f "$(DEPDIR)/substring.Tpo"; exit 1; fi 794 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/util/substring.cc' object='substring.o' libtool=no @AMDEPBACKSLASH@ 795 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/substring.Po' tmpdepfile='$(DEPDIR)/substring.TPo' @AMDEPBACKSLASH@ 796 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 797 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substring.o `test -f 'lib/util/substring.cc' || echo '$(srcdir)/'`lib/util/substring.cc 798 799 substring.obj: lib/util/substring.cc 800 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT substring.obj -MD -MP -MF "$(DEPDIR)/substring.Tpo" -c -o substring.obj `if test -f 'lib/util/substring.cc'; then $(CYGPATH_W) 'lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/substring.cc'; fi`; \ 801 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/substring.Tpo" "$(DEPDIR)/substring.Po"; else rm -f "$(DEPDIR)/substring.Tpo"; exit 1; fi 802 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/util/substring.cc' object='substring.obj' libtool=no @AMDEPBACKSLASH@ 803 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/substring.Po' tmpdepfile='$(DEPDIR)/substring.TPo' @AMDEPBACKSLASH@ 804 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 805 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o substring.obj `if test -f 'lib/util/substring.cc'; then $(CYGPATH_W) 'lib/util/substring.cc'; else $(CYGPATH_W) '$(srcdir)/lib/util/substring.cc'; fi` 806 770 807 vector.o: lib/math/vector.cc 771 808 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f 'lib/math/vector.cc' || echo '$(srcdir)/'`lib/math/vector.cc; \ … … 815 852 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 816 853 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curve.obj `if test -f 'lib/math/curve.cc'; then $(CYGPATH_W) 'lib/math/curve.cc'; else $(CYGPATH_W) '$(srcdir)/lib/math/curve.cc'; fi` 854 855 tinystr.o: lib/xmlparser/tinystr.cc 856 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.o -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc; \ 857 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi 858 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@ 859 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@ 860 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 861 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/xmlparser/tinystr.cc' || echo '$(srcdir)/'`lib/xmlparser/tinystr.cc 862 863 tinystr.obj: lib/xmlparser/tinystr.cc 864 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinystr.obj -MD -MP -MF "$(DEPDIR)/tinystr.Tpo" -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi`; \ 865 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi 866 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@ 867 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@ 868 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 869 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/xmlparser/tinystr.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinystr.cc'; fi` 870 871 tinyxml.o: lib/xmlparser/tinyxml.cc 872 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.o -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc; \ 873 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi 874 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@ 875 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@ 876 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 877 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/xmlparser/tinyxml.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxml.cc 878 879 tinyxml.obj: lib/xmlparser/tinyxml.cc 880 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxml.obj -MD -MP -MF "$(DEPDIR)/tinyxml.Tpo" -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi`; \ 881 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi 882 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@ 883 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@ 884 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 885 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/xmlparser/tinyxml.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxml.cc'; fi` 886 887 tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc 888 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.o -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc; \ 889 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi 890 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@ 891 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@ 892 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 893 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/xmlparser/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlerror.cc 894 895 tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc 896 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlerror.obj -MD -MP -MF "$(DEPDIR)/tinyxmlerror.Tpo" -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi`; \ 897 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi 898 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@ 899 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@ 900 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 901 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/xmlparser/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlerror.cc'; fi` 902 903 tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc 904 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.o -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc; \ 905 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi 906 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@ 907 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@ 908 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 909 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/xmlparser/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/xmlparser/tinyxmlparser.cc 910 911 tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc 912 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT tinyxmlparser.obj -MD -MP -MF "$(DEPDIR)/tinyxmlparser.Tpo" -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi`; \ 913 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi 914 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@ 915 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@ 916 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 917 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/xmlparser/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/xmlparser/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/xmlparser/tinyxmlparser.cc'; fi` 817 918 818 919 glmenu_imagescreen.o: glmenu/glmenu_imagescreen.cc … … 906 1007 tags=; \ 907 1008 here=`pwd`; \ 908 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \1009 if (etags --etags-include --version) >/dev/null 2>&1; then \ 909 1010 include_option=--etags-include; \ 910 empty_fix=.; \911 1011 else \ 912 1012 include_option=--include; \ 913 empty_fix=; \914 1013 fi; \ 915 1014 list='$(SUBDIRS)'; for subdir in $$list; do \ 916 1015 if test "$$subdir" = .; then :; else \ 917 test ! -f $$subdir/TAGS ||\1016 test -f $$subdir/TAGS && \ 918 1017 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 919 1018 fi; \ … … 925 1024 $(AWK) ' { files[$$0] = 1; } \ 926 1025 END { for (i in files) print i; }'`; \ 927 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 928 test -n "$$unique" || unique=$$empty_fix; \ 929 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 930 $$tags $$unique; \ 931 fi 1026 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 1027 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 1028 $$tags $$unique 932 1029 ctags: CTAGS 933 1030 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 954 1051 955 1052 distdir: $(DISTFILES) 956 $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/ network $(distdir)/story_entities $(distdir)/world_entities1053 $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/lib/xmlparser $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities 957 1054 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 958 1055 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ … … 999 1096 installdirs: installdirs-recursive 1000 1097 installdirs-am: 1001 for dir in "$(DESTDIR)$(bindir)"; do \ 1002 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 1003 done 1098 $(mkdir_p) $(DESTDIR)$(bindir) 1004 1099 install: install-recursive 1005 1100 install-exec: install-exec-recursive -
orxonox/branches/levelloader/src/defs/stdincl.h
r3523 r3525 39 39 #include "data_tank.h" 40 40 #include "base_object.h" 41 #include "factory.h" 41 42 42 43 #include "error.h" -
orxonox/branches/levelloader/src/factory.cc
r3504 r3525 51 51 \brief generates the associated object from data 52 52 */ 53 BaseObject* ObjectFactory::fabricate( TiX MLElement* data)53 BaseObject* ObjectFactory::fabricate( TiXmlElement* data) 54 54 { 55 55 return NULL; … … 74 74 } 75 75 76 const char* grabParameter( TiX MLElement* root, const char* name)76 const char* grabParameter( TiXmlElement* root, const char* name) 77 77 { 78 TiX MLElement* element;79 TiX MLNode* node;78 TiXmlElement* element; 79 TiXmlNode* node; 80 80 81 81 assert( root != NULL); -
orxonox/branches/levelloader/src/factory.h
r3504 r3525 8 8 9 9 #include "stdincl.h" 10 #include "xmlparser/tinyxml.h"11 #include "xmlparser/tinystr.h"12 #include "base_object.h"13 #include "orxonox.h"14 10 #include "world.h" 15 11 … … 19 15 ~CLASSFactory (); \ 20 16 private: \ 21 BaseObject* fabricate( TiX MLElement* root) \17 BaseObject* fabricate( TiXmlElement* root) \ 22 18 { \ 23 19 if(!strcmp(root->Value(), getClassname())) return new CLASS( root); \ … … 38 34 ~Factory (); 39 35 40 virtual BaseObject* fabricate( TiX MLElement* root);36 virtual BaseObject* fabricate( TiXmlElement* root); 41 37 void initialize(); 42 38 void registerFactory( Factory* factory); … … 53 49 // helper function 54 50 55 const char* grabParameter( TiX MLElement* root, const char* name);51 const char* grabParameter( TiXmlElement* root, const char* name); 56 52 57 #endif /* _LEVELFACTORY_H */ 53 #endif /* _FACTORY_H */ 54 -
orxonox/branches/levelloader/src/game_loader.cc
r3503 r3525 166 166 } 167 167 168 TiX MLDocument* XMLDoc = new TiXMLDocument( name);168 TiXmlDocument* XMLDoc = new TiXmlDocument( name); 169 169 // load the campaign document 170 170 if( !XMLDoc.LoadFile()) … … 177 177 178 178 // check basic validity 179 TiX MLElement* element = XMLDoc.RootElement();179 TiXmlElement* element = XMLDoc.RootElement(); 180 180 assert( element != NULL); 181 181 … … 277 277 \param element a XMLElement containing all the needed info 278 278 */ 279 StoryEntity* GameLoader::fabricate( TiX MLElement* element)279 StoryEntity* GameLoader::fabricate( TiXmlElement* element) 280 280 { 281 281 if( first == NULL) -
orxonox/branches/levelloader/src/game_loader.h
r3503 r3525 35 35 36 36 void registerFactory( Factory* factory); 37 BaseObject* fabricate( TiX MLElement* data);37 BaseObject* fabricate( TiXmlElement* data); 38 38 39 39 private: -
orxonox/branches/levelloader/src/lib/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 276 276 tags=; \ 277 277 here=`pwd`; \ 278 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \278 if (etags --etags-include --version) >/dev/null 2>&1; then \ 279 279 include_option=--etags-include; \ 280 empty_fix=.; \281 280 else \ 282 281 include_option=--include; \ 283 empty_fix=; \284 282 fi; \ 285 283 list='$(SUBDIRS)'; for subdir in $$list; do \ 286 284 if test "$$subdir" = .; then :; else \ 287 test ! -f $$subdir/TAGS ||\285 test -f $$subdir/TAGS && \ 288 286 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 289 287 fi; \ … … 295 293 $(AWK) ' { files[$$0] = 1; } \ 296 294 END { for (i in files) print i; }'`; \ 297 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 298 test -n "$$unique" || unique=$$empty_fix; \ 299 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 300 $$tags $$unique; \ 301 fi 295 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 296 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 297 $$tags $$unique 302 298 ctags: CTAGS 303 299 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/levelloader/src/lib/graphics/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 270 270 tags=; \ 271 271 here=`pwd`; \ 272 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \272 if (etags --etags-include --version) >/dev/null 2>&1; then \ 273 273 include_option=--etags-include; \ 274 empty_fix=.; \275 274 else \ 276 275 include_option=--include; \ 277 empty_fix=; \278 276 fi; \ 279 277 list='$(SUBDIRS)'; for subdir in $$list; do \ 280 278 if test "$$subdir" = .; then :; else \ 281 test ! -f $$subdir/TAGS ||\279 test -f $$subdir/TAGS && \ 282 280 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 283 281 fi; \ … … 289 287 $(AWK) ' { files[$$0] = 1; } \ 290 288 END { for (i in files) print i; }'`; \ 291 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 292 test -n "$$unique" || unique=$$empty_fix; \ 293 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 294 $$tags $$unique; \ 295 fi 289 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 290 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 291 $$tags $$unique 296 292 ctags: CTAGS 297 293 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/levelloader/src/lib/graphics/importer/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 42 42 subdir = src/lib/graphics/importer 43 43 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ 44 $(srcdir)/Makefile.in 44 $(srcdir)/Makefile.in TODO 45 45 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 46 46 am__aclocal_m4_deps = $(top_srcdir)/configure.ac … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 237 237 install-binPROGRAMS: $(bin_PROGRAMS) 238 238 @$(NORMAL_INSTALL) 239 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"239 $(mkdir_p) $(DESTDIR)$(bindir) 240 240 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 241 241 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 243 243 ; then \ 244 244 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 245 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \246 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \245 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 246 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 247 247 else :; fi; \ 248 248 done … … 252 252 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 253 253 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 254 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \255 rm -f "$(DESTDIR)$(bindir)/$$f"; \254 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 255 rm -f $(DESTDIR)$(bindir)/$$f; \ 256 256 done 257 257 … … 330 330 $(AWK) ' { files[$$0] = 1; } \ 331 331 END { for (i in files) print i; }'`; \ 332 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 333 test -n "$$unique" || unique=$$empty_fix; \ 334 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 335 $$tags $$unique; \ 336 fi 332 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 333 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 334 $$tags $$unique 337 335 ctags: CTAGS 338 336 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 389 387 all-am: Makefile $(PROGRAMS) $(HEADERS) 390 388 installdirs: 391 for dir in "$(DESTDIR)$(bindir)"; do \ 392 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 393 done 389 $(mkdir_p) $(DESTDIR)$(bindir) 394 390 install: install-am 395 391 install-exec: install-exec-am -
orxonox/branches/levelloader/src/lib/gui/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 272 272 tags=; \ 273 273 here=`pwd`; \ 274 if ( $(ETAGS)--etags-include --version) >/dev/null 2>&1; then \274 if (etags --etags-include --version) >/dev/null 2>&1; then \ 275 275 include_option=--etags-include; \ 276 empty_fix=.; \277 276 else \ 278 277 include_option=--include; \ 279 empty_fix=; \280 278 fi; \ 281 279 list='$(SUBDIRS)'; for subdir in $$list; do \ 282 280 if test "$$subdir" = .; then :; else \ 283 test ! -f $$subdir/TAGS ||\281 test -f $$subdir/TAGS && \ 284 282 tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ 285 283 fi; \ … … 291 289 $(AWK) ' { files[$$0] = 1; } \ 292 290 END { for (i in files) print i; }'`; \ 293 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 294 test -n "$$unique" || unique=$$empty_fix; \ 295 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 296 $$tags $$unique; \ 297 fi 291 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 292 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 293 $$tags $$unique 298 294 ctags: CTAGS 299 295 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -
orxonox/branches/levelloader/src/lib/gui/console/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 225 225 install-binPROGRAMS: $(bin_PROGRAMS) 226 226 @$(NORMAL_INSTALL) 227 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"227 $(mkdir_p) $(DESTDIR)$(bindir) 228 228 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 229 229 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 231 231 ; then \ 232 232 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 233 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \234 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \233 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 234 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 235 235 else :; fi; \ 236 236 done … … 240 240 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 241 241 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 242 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \243 rm -f "$(DESTDIR)$(bindir)/$$f"; \242 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 243 rm -f $(DESTDIR)$(bindir)/$$f; \ 244 244 done 245 245 … … 297 297 $(AWK) ' { files[$$0] = 1; } \ 298 298 END { for (i in files) print i; }'`; \ 299 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 300 test -n "$$unique" || unique=$$empty_fix; \ 301 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 302 $$tags $$unique; \ 303 fi 299 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 300 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 301 $$tags $$unique 304 302 ctags: CTAGS 305 303 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 356 354 all-am: Makefile $(PROGRAMS) $(HEADERS) 357 355 installdirs: 358 for dir in "$(DESTDIR)$(bindir)"; do \ 359 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 360 done 356 $(mkdir_p) $(DESTDIR)$(bindir) 361 357 install: install-am 362 358 install-exec: install-exec-am -
orxonox/branches/levelloader/src/lib/gui/gui/Makefile.in
r3499 r3525 1 # Makefile.in generated by automake 1.8. 5from Makefile.am.1 # Makefile.in generated by automake 1.8.2 from Makefile.am. 2 2 # @configure_input@ 3 3 … … 50 50 CONFIG_HEADER = $(top_builddir)/config.h 51 51 CONFIG_CLEAN_FILES = 52 am__installdirs = "$(DESTDIR)$(bindir)"52 am__installdirs = $(DESTDIR)$(bindir) 53 53 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 54 54 PROGRAMS = $(bin_PROGRAMS) … … 258 258 install-binPROGRAMS: $(bin_PROGRAMS) 259 259 @$(NORMAL_INSTALL) 260 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"260 $(mkdir_p) $(DESTDIR)$(bindir) 261 261 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 262 262 p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ … … 264 264 ; then \ 265 265 f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ 266 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \267 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f"|| exit 1; \266 echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ 267 $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \ 268 268 else :; fi; \ 269 269 done … … 273 273 @list='$(bin_PROGRAMS)'; for p in $$list; do \ 274 274 f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ 275 echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \276 rm -f "$(DESTDIR)$(bindir)/$$f"; \275 echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ 276 rm -f $(DESTDIR)$(bindir)/$$f; \ 277 277 done 278 278 … … 336 336 $(AWK) ' { files[$$0] = 1; } \ 337 337 END { for (i in files) print i; }'`; \ 338 if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ 339 test -n "$$unique" || unique=$$empty_fix; \ 340 $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 341 $$tags $$unique; \ 342 fi 338 test -z "$(ETAGS_ARGS)$$tags$$unique" \ 339 || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ 340 $$tags $$unique 343 341 ctags: CTAGS 344 342 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ … … 395 393 all-am: Makefile $(PROGRAMS) $(HEADERS) 396 394 installdirs: 397 for dir in "$(DESTDIR)$(bindir)"; do \ 398 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 399 done 395 $(mkdir_p) $(DESTDIR)$(bindir) 400 396 install: install-am 401 397 install-exec: install-exec-am -
orxonox/branches/levelloader/src/story_entities/campaign.cc
r3503 r3525 34 34 Campaign::~Campaign () {} 35 35 36 Campaign::Campaign ( TiX MLElement* root)37 { 38 TiX MLElement* element;36 Campaign::Campaign ( TiXmlElement* root) 37 { 38 TiXmlElement* element; 39 39 char string; 40 40 int id; -
orxonox/branches/levelloader/src/story_entities/campaign.h
r3501 r3525 13 13 public: 14 14 Campaign (); 15 Campaign ( TiX MLElement* root);15 Campaign ( TiXmlElement* root); 16 16 ~Campaign (); 17 17 -
orxonox/branches/levelloader/src/story_entities/story_entity.h
r3501 r3525 9 9 10 10 #include "stdincl.h" 11 11 12 #include "story_def.h" 12 13 … … 16 17 public: 17 18 StoryEntity (); 18 StoryEntity ( TiX MLElement* root) {};19 StoryEntity ( TiXmlElement* root) {}; 19 20 virtual ~StoryEntity (); 20 21 -
orxonox/branches/levelloader/src/story_entities/world.cc
r3523 r3525 34 34 35 35 36 World::World( TiX MLElement* root)36 World::World( TiXmlElement* root) 37 37 { 38 38 char *string, *name; … … 141 141 } 142 142 143 TiX MLDocument* XMLDoc = new TiXMLDocument( name);143 TiXmlDocument* XMLDoc = new TiXmlDocument( name); 144 144 // load the campaign document 145 145 if( !XMLDoc.LoadFile()) … … 152 152 153 153 // check basic validity 154 TiX MLElement* root = XMLDoc.RootElement();154 TiXmlElement* root = XMLDoc.RootElement(); 155 155 assert( root != NULL); 156 156 … … 167 167 // load the parameters 168 168 // name 169 TiX MLElement* element;169 TiXmlElement* element; 170 170 char* temp; 171 171 char* string = grabParameter( root, "name"); -
orxonox/branches/levelloader/src/story_entities/world.h
r3503 r3525 28 28 29 29 public: 30 World (TiX MLElement* root),30 World (TiXmlElement* root), 31 31 World (char* name); 32 32 World (int worldID); -
orxonox/branches/levelloader/src/track_manager.cc
r3523 r3525 90 90 } 91 91 92 /** 93 \brief Sets the name of this TrackElement 94 \param trackName The new name for this element 95 */ 96 void TrackElement::setName(const char* trackName) 97 { 98 if( this->name != NULL) delete this->name; 99 100 this->name = new char[strlen(trackName) + 1]; 101 strcpy( this->name, trackName); 102 } 103 104 /** 105 \brief Searches through all the TrackElements for trackName. 106 \param trackName The name to search for. 107 \returns The TrackElement if Found, NULL otherwise. 108 109 \todo make this more modular, to search for different things 110 */ 111 TrackElement* TrackElement::findByName(const char* trackName) 112 { 113 // return if Found. 114 if ( this->name != NULL && !strcmp( this->name, trackname)) 115 return this; 116 // search on. 117 if (this->childCount > 0) 118 for (int i=0; i < this->childCount; i++) 119 { 120 TrackElement* tmpElem; 121 if ((tmpElem = this->children[i]->findByName(trackName))) 122 return tmpElem; 123 } 124 else return NULL; 125 } 92 126 93 127 … … 106 140 107 141 PRINTF(3)("Initializing the TrackManager\n"); 108 this->namer = new TrackNamer();109 142 this->firstTrackElem = new TrackElement(); 110 143 this->firstTrackElem->ID = 1; … … 152 185 \param childCount The Count of children to make space for. 153 186 */ 154 void TrackManager::initChildren(unsigned int childCount )187 void TrackManager::initChildren(unsigned int childCount, SubString* names) 155 188 { 156 189 this->currentTrackElem->childCount = childCount; … … 159 192 for (int i=0; i<childCount; i++) 160 193 { 194 if( names != NULL) 195 { 196 if( this->findTrackElementByName( names->getString(i))) 197 { 198 PRINTF(ERR)("Track name '%s' already taken 199 } 200 } 201 161 202 this->currentTrackElem->children[i] = new TrackElement(); 162 203 this->currentTrackElem->children[i]->ID = ++trackElemCount; … … 176 217 } 177 218 219 /** 220 \brief Searches for a given trackname. 221 \param trackName the trackName to search for. 222 \returns The TrackElement if found, NULL otherwise. 223 */ 224 TrackElement* TrackManager::findTrackElementByName(const char* trackName) const 225 { 226 return firstTrackElem->findByName(trackName); 227 } 178 228 // INITIALIZE // 179 229 … … 317 367 \param count The Count of childrens the current HotPoint will have. 318 368 \param trackIDs A Pointer to an Array of ints which will hold the trackID's (the user will have to reserve space for this). 369 \param names A SubString containing the trackNames for the new tracks, if NULL, no names will be assigned 319 370 320 371 \see void TrackManager::fork(int count, ...) … … 322 373 \todo initialisation is wrong!! also in setSavePoint. 323 374 */ 324 void TrackManager::forkV(unsigned int count, int* trackIDs )375 void TrackManager::forkV(unsigned int count, int* trackIDs, SubString* names) 325 376 { 326 377 printf("Forking with %d children\n", count); … … 331 382 for(int i = 0; i < count; i++) 332 383 trackIDs[i]=this->trackElemCount+1+i; 333 this->initChildren(count );384 this->initChildren(count, names); 334 385 } 335 386 … … 636 687 \param root the element containing all track data 637 688 */ 638 void TrackManager::loadTrack( TiX MLElement* root)689 void TrackManager::loadTrack( TiXmlElement* root) 639 690 { 640 691 assert( root != NULL); 641 692 642 TiX MLElement* element;643 TiX MLNode* container;693 TiXmlElement* element; 694 TiXmlNode* container; 644 695 double x, y, z, d; 645 696 … … 720 771 void TrackManager::forkS( char* string) 721 772 { 773 // get the names for the tracks and therefore the amount of new tracks 774 SubString* names = new SubString( string); 775 int *IDs; 776 int n = parts->getN(); 777 778 assert( n != 0); 779 780 IDs = new int[n]; 781 782 forkV( n, IDs, names); 783 784 // IDs are irrelevant when assigning string names to tracks 785 delete IDs; 786 delete names; 787 } 788 789 /** 790 \brief joins the named strings 791 \param string the names of the track to be joined, separated by commas 792 */ 793 void TrackManager::joinS( char* string) 794 { 722 795 SubString* parts = new SubString( string); 723 796 int *IDs; … … 728 801 IDs = new int[n]; 729 802 730 forkV( n, IDs);731 732 for( int i = 0; i < n; i++)733 {734 PRINTF(DEBUG)("Track fork '%s'(%d) generated\n", parts->getString( i), IDs[i]);735 namer->add( parts->getString( i), IDs[i]);736 }737 738 delete IDs;739 delete parts;740 }741 742 /**743 \brief joins the named strings744 \param string the names of the track to be joined, separated by commas745 */746 void TrackManager::joinS( char* string)747 {748 SubString* parts = new SubString( string);749 int *IDs;750 int n = parts->getN();751 752 753 assert( n != 0);754 755 IDs = new int[n];756 757 803 int d, t; 758 804 d = 0; … … 763 809 for( int i = 0; i < n; i++) 764 810 { 765 IDs[d] = namer->getIDof(parts->getString( i));766 if( IDs[d] == -1)811 TrackElement* element = this->findTrackElementByName(parts->getString( i)); 812 if( element == NULL) 767 813 { 768 814 PRINTF(ERR)("Track name '%s' unknown, could not join\n", parts->getString( i)); … … 771 817 else 772 818 { 773 PRINTF(DEBUG)(" '%s'", parts->getString( i)); 819 PRINTF(DEBUG)(" '%s'(%d)", parts->getString( i), element->ID); 820 IDs[d] = element->ID; 774 821 d++; 775 822 } … … 790 837 void TrackManager::workOnS( char* string) 791 838 { 792 int i; 793 i = namer->getIdof( string); 794 if( i != -1) 795 { 796 WorkOn( i); 797 } 798 else PRINTF(ERR)("'%s' is not a valid TrackIdentifier\n", string); 799 } 800 801 802 // ------------------------------------------ 803 // TrackNamer 804 // ------------------------------------------- 805 806 TrackNamer::~TrackNamer() 807 { 808 TrackIdentifier* t; 809 810 while( first != NULL) 811 { 812 t = first; 813 first = first->next; 814 free( t->name); 815 free( t); 816 } 817 } 818 819 int TrackNamer::getIDof( const char* name) 820 { 821 TrackIdentifier *t; 822 t = first; 823 824 assert( name != NULL); 825 826 while( t != NULL) 827 { 828 if( !strcmp( name, t->name)) return t->ID; 829 } 830 831 return -1; 832 } 833 834 const char* TrackNamer::getNameof( int ID) 835 { 836 TrackIdentifier *t; 837 t = first; 838 839 assert( ID != -1); 840 841 while( t != NULL) 842 { 843 if( ID == t->ID) return t->name; 844 } 845 846 return NULL; 847 } 848 849 void TrackNamer::add( const char* name, int ID) 850 { 851 TrackIdentifier *t, *d; 852 853 assert( name != NULL); 854 assert( ID != -1); 855 856 t = malloc( sizeof( TrackIdentifier)); 857 t->next = NULL; 858 t->ID = ID; 859 t->name = malloc( strlen( name) + 1); 860 strcpy( t->name, name); 861 862 if( first == NULL) 863 { 864 first = t; 865 } 866 else 867 { 868 d = first; 869 while( d->next != NULL) 870 { 871 if( ID == d->ID) 872 { 873 PRINTF(ERR)("Track ID %d already named %s (tried to name it %s)\n", ID, d->name, name); 874 free( t->name); 875 free( t); 876 return; 877 } 878 if( !strcmp( name, d->name)) 879 { 880 PRINTF(ERR)("Track name %s already used by track ID %d (tried to assign it to track ID %d)<n", name, d->ID, ID); 881 free( t->name); 882 free( t); 883 return; 884 } 885 d = d->next; 886 } 887 d->next = t; 888 } 889 } 839 TrackElement* tmpElem = findTrackElementByName( string); 840 if (tmpElem) 841 this->currentTrackElem = tmpElem; 842 else 843 PRINTF(ERR)("TrackElement not Found, leaving unchanged\n"); 844 PRINTF(DEBUG)("now Working on %d\n", this->currentTrackElem->ID); 845 } -
orxonox/branches/levelloader/src/track_manager.h
r3523 r3525 37 37 38 38 TrackElement* findByID(unsigned int trackID); 39 TrackElement* findByName(const char* trackName); 39 40 40 41 bool isFresh; //!< If no Points where added until now … … 107 108 int trackElemCount; //!< The count of TrackElements that exist. 108 109 PNode* bindSlave; 109 TrackNamer* namer;110 110 111 void initChildren(unsigned int childCount );111 void initChildren(unsigned int childCount, SubString* names = NULL); 112 112 113 113 TrackElement* findTrackElementByID(unsigned int trackID) const; 114 TrackElement* findTrackElementByName(char* trackName) const; 114 115 115 116 public: … … 127 128 int setSavePoint(void); 128 129 void fork(unsigned int count, ...); 129 void forkV(unsigned int count, int* trackIDs );130 void forkV(unsigned int count, int* trackIDs, SubString* names = NULL); 130 131 void condition(unsigned int groupID, PathCondition cond); //!< \todo really do this!! 131 132 void join(unsigned int count, ...); … … 137 138 138 139 // Method to load track data from file 139 void loadTrack( TiX MLElement* root);140 void loadTrack( TiXmlElement* root); 140 141 141 142 // Methods to calculate the position on the Path (runtime) … … 153 154 }; 154 155 155 typedef struct156 {157 int ID;158 char* name;159 struct TrackIdentifier *next;160 } TrackIdentifier;161 162 class TrackNamer163 {164 public:165 TrackNamer() { first = NULL};166 ~TrackNamer();167 168 int getIDof( const char* name);169 const char* getNameof( int ID);170 void add( const char* name, int ID);171 172 private:173 TrackIdentifier* first;174 };175 176 156 #endif /* _TRACK_MANAGER_H */
Note: See TracChangeset
for help on using the changeset viewer.