Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4239 in orxonox.OLD


Ignore:
Timestamp:
May 20, 2005, 2:44:10 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/levelLoader: factory not in stdincl anymore

Location:
orxonox/branches/levelLoader/src
Files:
18 edited
1 moved

Legend:

Unmodified
Added
Removed

  • orxonox/branches/levelLoader/src/Makefile.am

    r4233 r4239  
    1414AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    1515AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
     16AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    1617AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    1718AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    … …  
    183184                            lib/gui/gui/gui_update.cc
    184185
    185 libtinyxml_a_SOURCES = lib/xmlparser/tinyxml.cc \
    186                        lib/xmlparser/tinystr.cc \
    187                        lib/xmlparser/tinyxmlerror.cc \
    188                        lib/xmlparser/tinyxmlparser.cc
     186libtinyxml_a_SOURCES = lib/tinyxml/tinyxml.cc \
     187                       lib/tinyxml/tinystr.cc \
     188                       lib/tinyxml/tinyxmlerror.cc \
     189                       lib/tinyxml/tinyxmlparser.cc
    189190
    190191

  • orxonox/branches/levelLoader/src/Makefile.in

    r4233 r4239  
    280280target_vendor = @target_vendor@
    281281MAINSRCDIR = .
    282 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/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/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)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/subprojects
     282AM_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/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/lib/tinyxml -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/util/loading -I$(MAINSRCDIR)/subprojects
    283283noinst_LIBRARIES = libORXgui.a \
    284284                   libtinyxml.a
    … …  
    433433                            lib/gui/gui/gui_update.cc
    434434
    435 libtinyxml_a_SOURCES = lib/xmlparser/tinyxml.cc \
    436                        lib/xmlparser/tinystr.cc \
    437                        lib/xmlparser/tinyxmlerror.cc \
    438                        lib/xmlparser/tinyxmlparser.cc
     435libtinyxml_a_SOURCES = lib/tinyxml/tinyxml.cc \
     436                       lib/tinyxml/tinystr.cc \
     437                       lib/tinyxml/tinyxmlerror.cc \
     438                       lib/tinyxml/tinyxmlparser.cc
    439439
    440440EXTRA_DIST = proto/proto_class.h \
    … …  
    772772@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libORXgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libORXgui_a-gui_update.obj `if test -f 'lib/gui/gui/gui_update.cc'; then $(CYGPATH_W) 'lib/gui/gui/gui_update.cc'; else $(CYGPATH_W) '$(srcdir)/lib/gui/gui/gui_update.cc'; fi`
    773773
    774 tinyxml.o: lib/xmlparser/tinyxml.cc
    775 @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; \
     774tinyxml.o: lib/tinyxml/tinyxml.cc
     775@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/tinyxml/tinyxml.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxml.cc; \
    776776@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
    777 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
     777@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxml.cc' object='tinyxml.o' libtool=no @AMDEPBACKSLASH@
    778778@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
    779779@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    780 @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
    781 
    782 tinyxml.obj: lib/xmlparser/tinyxml.cc
    783 @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`; \
     780@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.o `test -f 'lib/tinyxml/tinyxml.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxml.cc
     781
     782tinyxml.obj: lib/tinyxml/tinyxml.cc
     783@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/tinyxml/tinyxml.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxml.cc'; fi`; \
    784784@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxml.Tpo" "$(DEPDIR)/tinyxml.Po"; else rm -f "$(DEPDIR)/tinyxml.Tpo"; exit 1; fi
    785 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
     785@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxml.cc' object='tinyxml.obj' libtool=no @AMDEPBACKSLASH@
    786786@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxml.Po' tmpdepfile='$(DEPDIR)/tinyxml.TPo' @AMDEPBACKSLASH@
    787787@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    788 @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`
    789 
    790 tinystr.o: lib/xmlparser/tinystr.cc
    791 @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; \
     788@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxml.obj `if test -f 'lib/tinyxml/tinyxml.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxml.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxml.cc'; fi`
     789
     790tinystr.o: lib/tinyxml/tinystr.cc
     791@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/tinyxml/tinystr.cc' || echo '$(srcdir)/'`lib/tinyxml/tinystr.cc; \
    792792@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
    793 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
     793@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinystr.cc' object='tinystr.o' libtool=no @AMDEPBACKSLASH@
    794794@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
    795795@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    796 @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
    797 
    798 tinystr.obj: lib/xmlparser/tinystr.cc
    799 @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`; \
     796@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.o `test -f 'lib/tinyxml/tinystr.cc' || echo '$(srcdir)/'`lib/tinyxml/tinystr.cc
     797
     798tinystr.obj: lib/tinyxml/tinystr.cc
     799@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/tinyxml/tinystr.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinystr.cc'; fi`; \
    800800@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinystr.Tpo" "$(DEPDIR)/tinystr.Po"; else rm -f "$(DEPDIR)/tinystr.Tpo"; exit 1; fi
    801 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
     801@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinystr.cc' object='tinystr.obj' libtool=no @AMDEPBACKSLASH@
    802802@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinystr.Po' tmpdepfile='$(DEPDIR)/tinystr.TPo' @AMDEPBACKSLASH@
    803803@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    804 @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`
    805 
    806 tinyxmlerror.o: lib/xmlparser/tinyxmlerror.cc
    807 @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; \
     804@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinystr.obj `if test -f 'lib/tinyxml/tinystr.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinystr.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinystr.cc'; fi`
     805
     806tinyxmlerror.o: lib/tinyxml/tinyxmlerror.cc
     807@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/tinyxml/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlerror.cc; \
    808808@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
    809 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
     809@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlerror.cc' object='tinyxmlerror.o' libtool=no @AMDEPBACKSLASH@
    810810@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
    811811@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    812 @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
    813 
    814 tinyxmlerror.obj: lib/xmlparser/tinyxmlerror.cc
    815 @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`; \
     812@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.o `test -f 'lib/tinyxml/tinyxmlerror.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlerror.cc
     813
     814tinyxmlerror.obj: lib/tinyxml/tinyxmlerror.cc
     815@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/tinyxml/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlerror.cc'; fi`; \
    816816@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlerror.Tpo" "$(DEPDIR)/tinyxmlerror.Po"; else rm -f "$(DEPDIR)/tinyxmlerror.Tpo"; exit 1; fi
    817 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
     817@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlerror.cc' object='tinyxmlerror.obj' libtool=no @AMDEPBACKSLASH@
    818818@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlerror.Po' tmpdepfile='$(DEPDIR)/tinyxmlerror.TPo' @AMDEPBACKSLASH@
    819819@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    820 @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`
    821 
    822 tinyxmlparser.o: lib/xmlparser/tinyxmlparser.cc
    823 @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; \
     820@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlerror.obj `if test -f 'lib/tinyxml/tinyxmlerror.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlerror.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlerror.cc'; fi`
     821
     822tinyxmlparser.o: lib/tinyxml/tinyxmlparser.cc
     823@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/tinyxml/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlparser.cc; \
    824824@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
    825 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
     825@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlparser.cc' object='tinyxmlparser.o' libtool=no @AMDEPBACKSLASH@
    826826@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
    827827@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    828 @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
    829 
    830 tinyxmlparser.obj: lib/xmlparser/tinyxmlparser.cc
    831 @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`; \
     828@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.o `test -f 'lib/tinyxml/tinyxmlparser.cc' || echo '$(srcdir)/'`lib/tinyxml/tinyxmlparser.cc
     829
     830tinyxmlparser.obj: lib/tinyxml/tinyxmlparser.cc
     831@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/tinyxml/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlparser.cc'; fi`; \
    832832@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/tinyxmlparser.Tpo" "$(DEPDIR)/tinyxmlparser.Po"; else rm -f "$(DEPDIR)/tinyxmlparser.Tpo"; exit 1; fi
    833 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/xmlparser/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
     833@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/tinyxml/tinyxmlparser.cc' object='tinyxmlparser.obj' libtool=no @AMDEPBACKSLASH@
    834834@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/tinyxmlparser.Po' tmpdepfile='$(DEPDIR)/tinyxmlparser.TPo' @AMDEPBACKSLASH@
    835835@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    836 @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`
     836@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o tinyxmlparser.obj `if test -f 'lib/tinyxml/tinyxmlparser.cc'; then $(CYGPATH_W) 'lib/tinyxml/tinyxmlparser.cc'; else $(CYGPATH_W) '$(srcdir)/lib/tinyxml/tinyxmlparser.cc'; fi`
    837837
    838838camera.o: world_entities/camera.cc

  • orxonox/branches/levelLoader/src/defs/stdincl.h

    r4091 r4239  
    2828
    2929#include "compiler.h"
    30 #include "xmlparser/tinyxml.h"
    31 #include "factory.h"
    3230
    3331#endif /* _STDINCL_H */

  • orxonox/branches/levelLoader/src/factory.cc

    r4020 r4239  
    8888}
    8989
    90 const char* grabParameter( TiXmlElement* root, const char* name)
     90const char* grabParameter(const TiXmlElement* root, const char* name)
    9191{
    92   TiXmlElement* element;
    93   TiXmlNode* node;
     92  const TiXmlElement* element;
     93  const TiXmlNode* node;
    9494       
    9595  assert( root != NULL);

  • orxonox/branches/levelLoader/src/factory.h

    r4171 r4239  
    99class BaseObject;
    1010
    11 #include "xmlparser/tinyxml.h"
     11#include "tinyxml.h"
    1212#include "debug.h"
    1313
    … …  
    7979// helper function
    8080
    81 const char* grabParameter( TiXmlElement* root, const char* name);
     81const char* grabParameter(const TiXmlElement* root, const char* name);
    8282
    8383#endif /* _FACTORY_H */

  • orxonox/branches/levelLoader/src/game_loader.cc

    r4216 r4239  
    1515   co-programmer: ...
    1616*/
    17 
    1817
    1918#include "game_loader.h"
    … …  
    8584}
    8685
    87 
    8886/**
    8987   \brief loads a debug campaign for test purposes only.

  • orxonox/branches/levelLoader/src/game_loader.h

    r4216 r4239  
    1919class Camera;
    2020class CammandNode;
     21class Factory;
     22class TiXmlElement;
     23class BaseObject;
    2124
    2225//! The GameLoader

  • orxonox/branches/levelLoader/src/glmenu/glmenu_imagescreen.cc

    r4136 r4239  
    1919#include "glmenu_imagescreen.h"
    2020
    21 #include "stdincl.h"
    2221#include "graphics_engine.h"
    2322#include "material.h"
     23#include "factory.h"
    2424
    2525CREATE_FACTORY(GLMenuImageScreen);

  • orxonox/branches/levelLoader/src/story_entities/campaign.cc

    r4114 r4239  
    2727#include "list.h"
    2828
     29#include "load_param.h"
     30
    2931using namespace std;
    3032
    … …  
    3537  this->isInit = false;
    3638}
     39
    3740Campaign::Campaign ( TiXmlElement* root)
    3841{

  • orxonox/branches/levelLoader/src/story_entities/campaign.h

    r4010 r4239  
    88
    99class World;
     10class TiXmlElement;
    1011template<class T> class tList;
    1112

  • orxonox/branches/levelLoader/src/story_entities/story_entity.h

    r3629 r4239  
    1111#include "story_def.h"
    1212#include "error.h"
    13 
    1413
    1514//! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...

  • orxonox/branches/levelLoader/src/story_entities/world.cc

    r4230 r4239  
    5050
    5151#include "substring.h"
     52
     53#include "factory.h"
    5254
    5355using namespace std;

  • orxonox/branches/levelLoader/src/story_entities/world.h

    r4176 r4239  
    1111#include "story_entity.h"
    1212#include "p_node.h"
    13 #include "xmlparser/tinyxml.h"
    1413
    1514class World;
    … …  
    2423class GarbageCollector;
    2524class Text;
     25class TiXmlElement;
    2626
    2727//! The game world Interface

  • orxonox/branches/levelLoader/src/track_manager.cc

    r4220 r4239  
    2626#include "t_animation.h"
    2727#include "substring.h"
     28#include "tinyxml.h"
    2829
    2930#include <stdarg.h>

  • orxonox/branches/levelLoader/src/track_manager.h

    r4220 r4239  
    1818class PNode;
    1919class Text;
     20class TiXmlElement;
    2021template<class T> class tAnimation;
    2122template<class T> class tList;

  • orxonox/branches/levelLoader/src/util/loading/load_param.h

    r4233 r4239  
    33#define _LOAD_PARAM_H
    44
     5#include "factory.h"
     6#include "debug.h"
    57
    68// abstract base class
    … …  
    1517template<class T> class LoadParam : public baseLoadParam
    1618{
    17  private:
    18   T* pt2Object;                  // pointer to object
    19 
    2019 public:
    21   LoadParam(const char* loadString, T* pt2Object, void(T::*function)(const char*))
     20  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const char*))
    2221    {
    23       this->pt2Object = pt2Object;
    24 
    25       (*pt2Object.*function)(loadString);
     22      const char* loadString = grabParameter(root, paramName);
     23      if (loadString != NULL)
     24        (*pt2Object.*function)(loadString);
     25      else
     26        PRINTF(2)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
     27     
    2628    };
    2729
    28   LoadParam(const char* loadString, T* pt2Object, void(T::*function)(float))
    29     {
    30       this->pt2Object = pt2Object;
    31      
    32       (*pt2Object.*function)(atoi(loadString));
     30  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(float))
     31    {
     32      const char* loadString = grabParameter(root, paramName);
     33      if (loadString != NULL)
     34        (*pt2Object.*function)(atoi(loadString));
     35      else
     36        PRINTF(2)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
    3337    };
    3438};

  • orxonox/branches/levelLoader/src/world_entities/world_entity.cc

    r4233 r4239  
    2323#include "vector.h"
    2424
    25 #include "load_param.h"
    26 
    2725using namespace std;
    2826
    … …  
    4341WorldEntity::WorldEntity(TiXmlElement* root)
    4442{
     43  this->setClassName ("WorldEntity");
    4544  // Name Setup
    46   char* temp;
    47   const char* string;
    48   string = grabParameter( root, "name");
    49   if( string == NULL)
    50     {
    51       PRINTF(2)("WorldEntity is missing a proper 'name'\n");
    52       this->setName("unknown");
    53     }
    54   else
    55     {
    56       LoadParam<WorldEntity> (string, this, &WorldEntity::setName);
    57     }
     45  LoadParam<WorldEntity>(root, "name", this, &WorldEntity::setName);
    5846  // Model Loading     
    5947  this->model = NULL;
    60   string = grabParameter( root, "model");
    61   if( string != NULL)
    62     LoadParam<WorldEntity>(string, this, &WorldEntity::loadModel);
    63   else
    64     {
    65       PRINTF(2)("WorldEntity is missing a proper 'model'\n");
    66       this->model = NULL;
    67     }
    68   if( this->model == NULL)
    69     {
    70       PRINTF(2)("WorldEntity model '%s' could not be loaded\n", string);
    71     }
     48  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel);
     49
    7250  this->bDraw = true;
    7351}

  • orxonox/branches/levelLoader/src/world_entities/world_entity.h

    r4233 r4239  
    1010#include "comincl.h"
    1111#include "resource_manager.h"
     12#include "factory.h"
     13#include "load_param.h"
    1214
    1315
    … …  
    1517class CharacterAttributes;
    1618class Model;
    17 
    18 
    1919//! Basic class from which all interactive stuff in the world is derived from
    2020class WorldEntity : public PNode
Note: See TracChangeset for help on using the changeset viewer.