Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4492 in orxonox.OLD for orxonox/trunk/src


Ignore:
Timestamp:
Jun 3, 2005, 1:55:22 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: importer works again

Location:
orxonox/trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/subprojects/gui/Makefile.am

    r4271 r4492  
    11MAINSRCDIR=../..
    2 AM_CXXFLAGS=-I$(MAINSRCDIR)
    3 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
    4 AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
    5 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
    6 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
    7 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    8 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
    9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
    11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
    12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
    16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
    20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
    21 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
    22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
    23 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    24 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
    25 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
    26 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
    27 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
     2include $(MAINSRCDIR)/defs/include_paths.am
     3
    284
    295AM_LDFLAGS=$(MWINDOWS)

  • orxonox/trunk/src/subprojects/importer/Makefile.am

    r4343 r4492  
    11MAINSRCDIR=../..
    2 AM_CXXFLAGS=-I$(MAINSRCDIR)
    3 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
    4 AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
    5 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
    6 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
    7 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    8 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
    9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
    11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
    12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
    16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
    20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
    21 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
    22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
    23 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    24 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
    25 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
    26 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
    27 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
     2include $(MAINSRCDIR)/defs/include_paths.am
    283
    294
    … …  
    327bin_PROGRAMS = importer
    338
     9importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
     10                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
    3411
    3512importer_SOURCES= ../framework.cc \
    … …  
    4017                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
    4118                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
     19                  $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc \
    4220                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
    4321                  $(MAINSRCDIR)/lib/graphics/importer/array.cc \
    … …  
    4826                  $(MAINSRCDIR)/lib/math/vector.cc \
    4927                  $(MAINSRCDIR)/util/resource_manager.cc \
     28                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
    5029                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    5130                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    52                   $(MAINSRCDIR)/lib/coord/null_parent.cc
     31                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
     32                  $(MAINSRCDIR)/util/loading/load_param.cc

  • orxonox/trunk/src/subprojects/importer/Makefile.in

    r4438 r4492  
    5353am_importer_OBJECTS = framework.$(OBJEXT) importer.$(OBJEXT) \
    5454        light.$(OBJEXT) state.$(OBJEXT) camera.$(OBJEXT) \
    55         model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
    56         array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
    57         graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
    58         vector.$(OBJEXT) resource_manager.$(OBJEXT) \
    59         text_engine.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT)
     55        model.$(OBJEXT) objModel.$(OBJEXT) md2Model.$(OBJEXT) \
     56        primitive_model.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
     57        texture.$(OBJEXT) graphics_engine.$(OBJEXT) \
     58        base_object.$(OBJEXT) vector.$(OBJEXT) \
     59        resource_manager.$(OBJEXT) ini_parser.$(OBJEXT) \
     60        text_engine.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
     61        load_param.$(OBJEXT)
    6062importer_OBJECTS = $(am_importer_OBJECTS)
    61 importer_LDADD = $(LDADD)
     63importer_DEPENDENCIES = $(MAINSRCDIR)/lib/event/libORXevent.a \
     64        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
    6265DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6366depcomp = $(SHELL) $(top_srcdir)/depcomp
    … …  
    6770@AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
    6871@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    69 @AMDEP_TRUE@    ./$(DEPDIR)/importer.Po ./$(DEPDIR)/light.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
     72@AMDEP_TRUE@    ./$(DEPDIR)/importer.Po ./$(DEPDIR)/ini_parser.Po \
     73@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/load_param.Po \
     74@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
     76@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/p_node.Po \
    7377@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    7478@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    … …  
    194198target_vendor = @target_vendor@
    195199MAINSRCDIR = ../..
    196 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)/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)/util/track -I$(MAINSRCDIR)/subprojects
    197200AM_LDFLAGS = $(MWINDOWS)
     201importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
     202                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
     203
    198204importer_SOURCES = ../framework.cc \
    199205                  importer.cc \
    … …  
    203209                  $(MAINSRCDIR)/lib/graphics/importer/model.cc \
    204210                  $(MAINSRCDIR)/lib/graphics/importer/objModel.cc \
     211                  $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc \
    205212                  $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc \
    206213                  $(MAINSRCDIR)/lib/graphics/importer/array.cc \
    … …  
    211218                  $(MAINSRCDIR)/lib/math/vector.cc \
    212219                  $(MAINSRCDIR)/util/resource_manager.cc \
     220                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
    213221                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    214222                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    215                   $(MAINSRCDIR)/lib/coord/null_parent.cc
     223                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
     224                  $(MAINSRCDIR)/util/loading/load_param.cc
    216225
    217226all: all-am
    … …  
    287296@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
    288297@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer.Po@am__quote@
     298@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    289299@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
     300@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_param.Po@am__quote@
    290301@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     302@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
    291303@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    292304@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
    … …  
    412424@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/objModel.cc'; fi`
    413425
     426md2Model.o: $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc
     427@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md2Model.o -MD -MP -MF "$(DEPDIR)/md2Model.Tpo" -c -o md2Model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc; \
     428@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
     429@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' object='md2Model.o' libtool=no @AMDEPBACKSLASH@
     430@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.TPo' @AMDEPBACKSLASH@
     431@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     432@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md2Model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc
     433
     434md2Model.obj: $(MAINSRCDIR)/lib/graphics/importer/md2Model.cc
     435@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md2Model.obj -MD -MP -MF "$(DEPDIR)/md2Model.Tpo" -c -o md2Model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; fi`; \
     436@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
     437@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc' object='md2Model.obj' libtool=no @AMDEPBACKSLASH@
     438@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.TPo' @AMDEPBACKSLASH@
     439@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     440@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md2Model.obj `if test -f '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/importer/md2Model.cc'; fi`
     441
    414442primitive_model.o: $(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc
    415443@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive_model.o -MD -MP -MF "$(DEPDIR)/primitive_model.Tpo" -c -o primitive_model.o `test -f '$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/importer/primitive_model.cc; \
    … …  
    540568@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`
    541569
     570ini_parser.o: $(MAINSRCDIR)/lib/util/ini_parser.cc
     571@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ini_parser.o -MD -MP -MF "$(DEPDIR)/ini_parser.Tpo" -c -o ini_parser.o `test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/ini_parser.cc; \
     572@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ini_parser.Tpo" "$(DEPDIR)/ini_parser.Po"; else rm -f "$(DEPDIR)/ini_parser.Tpo"; exit 1; fi
     573@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/ini_parser.cc' object='ini_parser.o' libtool=no @AMDEPBACKSLASH@
     574@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ini_parser.Po' tmpdepfile='$(DEPDIR)/ini_parser.TPo' @AMDEPBACKSLASH@
     575@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     576@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.o `test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/ini_parser.cc
     577
     578ini_parser.obj: $(MAINSRCDIR)/lib/util/ini_parser.cc
     579@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ini_parser.obj -MD -MP -MF "$(DEPDIR)/ini_parser.Tpo" -c -o ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`; \
     580@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/ini_parser.Tpo" "$(DEPDIR)/ini_parser.Po"; else rm -f "$(DEPDIR)/ini_parser.Tpo"; exit 1; fi
     581@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/ini_parser.cc' object='ini_parser.obj' libtool=no @AMDEPBACKSLASH@
     582@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/ini_parser.Po' tmpdepfile='$(DEPDIR)/ini_parser.TPo' @AMDEPBACKSLASH@
     583@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     584@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`
     585
    542586text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    543587@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT text_engine.o -MD -MP -MF "$(DEPDIR)/text_engine.Tpo" -c -o text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
    … …  
    587631@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    588632@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
     633
     634load_param.o: $(MAINSRCDIR)/util/loading/load_param.cc
     635@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT load_param.o -MD -MP -MF "$(DEPDIR)/load_param.Tpo" -c -o load_param.o `test -f '$(MAINSRCDIR)/util/loading/load_param.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/load_param.cc; \
     636@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/load_param.Tpo" "$(DEPDIR)/load_param.Po"; else rm -f "$(DEPDIR)/load_param.Tpo"; exit 1; fi
     637@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/loading/load_param.cc' object='load_param.o' libtool=no @AMDEPBACKSLASH@
     638@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/load_param.Po' tmpdepfile='$(DEPDIR)/load_param.TPo' @AMDEPBACKSLASH@
     639@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     640@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.o `test -f '$(MAINSRCDIR)/util/loading/load_param.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/loading/load_param.cc
     641
     642load_param.obj: $(MAINSRCDIR)/util/loading/load_param.cc
     643@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT load_param.obj -MD -MP -MF "$(DEPDIR)/load_param.Tpo" -c -o load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`; \
     644@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/load_param.Tpo" "$(DEPDIR)/load_param.Po"; else rm -f "$(DEPDIR)/load_param.Tpo"; exit 1; fi
     645@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/util/loading/load_param.cc' object='load_param.obj' libtool=no @AMDEPBACKSLASH@
     646@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/load_param.Po' tmpdepfile='$(DEPDIR)/load_param.TPo' @AMDEPBACKSLASH@
     647@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     648@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
    589649uninstall-info-am:
    590650
    … …  
    755815        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    756816
     817include $(MAINSRCDIR)/defs/include_paths.am
    757818# Tell versions [3.59,3.63) of GNU make to not export all variables.
    758819# Otherwise a system limit (for SysV at least) may be exceeded.

  • orxonox/trunk/src/subprojects/importer/importer.cc

    r4360 r4492  
    3434    obj = new OBJModel(argv[1]);
    3535  else
    36     obj = new PrimitiveModel(CYLINDER);
     36    obj = new PrimitiveModel(PRIM_CYLINDER);
    3737
    3838  LightManager* lightMan = LightManager::getInstance();

  • orxonox/trunk/src/subprojects/particles/Makefile.am

    r4429 r4492  
    11MAINSRCDIR=../..
    2 AM_CXXFLAGS=-I$(MAINSRCDIR)
    3 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
    4 AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
    5 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
    6 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
    7 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    8 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
    9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
    11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
    12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
    13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
    16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics
    17 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
    18 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/tinyxml
    19 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    20 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    21 AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
    22 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
    23 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
    24 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util
    25 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/animation
    26 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/common
    27 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/loading
    28 AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
    29 AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
     2include $(MAINSRCDIR)/defs/include_paths.am
    303
    314

  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4438 r4492  
    213213target_vendor = @target_vendor@
    214214MAINSRCDIR = ../..
    215 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)/lib/physics -I$(MAINSRCDIR)/lib/physics/fields -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)/util/track -I$(MAINSRCDIR)/subprojects
    216215particles_LDADD = $(MAINSRCDIR)/lib/physics/libORXphysics.a \
    217216                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS) \
    … …  
    868867        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    869868
     869include $(MAINSRCDIR)/defs/include_paths.am
    870870# Tell versions [3.59,3.63) of GNU make to not export all variables.
    871871# Otherwise a system limit (for SysV at least) may be exceeded.

  • orxonox/trunk/src/subprojects/testmain/Makefile.am

    r3549 r4492  
    11MAINSRCDIR=../..
    2 AM_CXXFLAGS=-I$(MAINSRCDIR)
    3 AM_CXXFLAGS+=-I$(MAINSRCDIR)/world_entities
    4 AM_CXXFLAGS+=-I$(MAINSRCDIR)/story_entities
    5 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib
    6 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    7 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
    8 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/lang
    10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/util
    11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/math
    12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    14 AM_CXXFLAGS+=-I$(MAINSRCDIR)/network
    15 AM_CXXFLAGS+=-I$(MAINSRCDIR)/glmenu
    16 AM_CXXFLAGS+=-I$(MAINSRCDIR)/ai
     2include $(MAINSRCDIR)/defs/include_paths.am
    173
    184

  • orxonox/trunk/src/util/loading/factory.cc

    r4487 r4492  
    9494}
    9595
    96 /**
    97    \param root: The XML-element to grab a parameter from
    98    \param parameterName: the parameter to grab
    99    \returns the Value of the parameter if found, NULL otherwise
    100 */
    101 const char* grabParameter(const TiXmlElement* root, const char* parameterName)
    102 {
    103   const TiXmlElement* element;
    104   const TiXmlNode* node;
    105        
    106   if (root == NULL)
    107     return NULL;
    108   assert( parameterName != NULL);
    109        
    110   element = root->FirstChildElement( parameterName);
    111   if( element == NULL) return NULL;
    112        
    113   node = element->FirstChild();
    114   while( node != NULL)
    115     {
    116       if( node->ToText()) return node->Value();
    117       node = node->NextSibling();
    118     }
    119   return NULL;
    120 }
    121 

  • orxonox/trunk/src/util/loading/factory.h

    r4487 r4492  
    100100}
    101101
    102 // helper function
    103 
    104 const char* grabParameter(const TiXmlElement* root, const char* parameterName);
    105 
    106102#endif /* _FACTORY_H */
    107103

  • orxonox/trunk/src/util/loading/load_param.cc

    r4487 r4492  
    236236  PRINT(3)("===============================================================\n");
    237237}
     238
     239
     240
     241/**
     242   \param root: The XML-element to grab a parameter from
     243   \param parameterName: the parameter to grab
     244   \returns the Value of the parameter if found, NULL otherwise
     245*/
     246const char* grabParameter(const TiXmlElement* root, const char* parameterName)
     247{
     248  const TiXmlElement* element;
     249  const TiXmlNode* node;
     250       
     251  if (root == NULL)
     252    return NULL;
     253  assert( parameterName != NULL);
     254       
     255  element = root->FirstChildElement( parameterName);
     256  if( element == NULL) return NULL;
     257       
     258  node = element->FirstChild();
     259  while( node != NULL)
     260    {
     261      if( node->ToText()) return node->Value();
     262      node = node->NextSibling();
     263    }
     264  return NULL;
     265}

  • orxonox/trunk/src/util/loading/load_param.h

    r4487 r4492  
    266266};
    267267
     268// helper function
     269
     270const char* grabParameter(const TiXmlElement* root, const char* parameterName);
    268271
    269272#endif /* _LOAD_PARAM_H */
Note: See TracChangeset for help on using the changeset viewer.