Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4564 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 9, 2005, 12:51:01 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: building the importer-stuff as a lib

Location:
orxonox/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/orxonox.kdevelop

    r4560 r4564  
    2626      <autocompile>true</autocompile>
    2727      <envvars/>
     28      <runarguments>
     29        <orxonox></orxonox>
     30      </runarguments>
    2831    </run>
    2932    <configurations>

  • orxonox/trunk/src/Makefile.am

    r4556 r4564  
    99
    1010orxonox_DEPENDENCIES = lib/gui/libORXgui.a \
     11                       lib/graphics/importer/libORXimporter.a \
    1112                       lib/sound/libORXsound.a \
    1213                       lib/event/libORXevent.a \
    … …  
    1718
    1819orxonox_LDADD = lib/gui/libORXgui.a \
     20                lib/graphics/importer/libORXimporter.a \
    1921                lib/sound/libORXsound.a \
    2022                lib/event/libORXevent.a \
    … …  
    6365                  lib/graphics/light.cc \
    6466                  lib/graphics/text_engine.cc \
    65                   lib/graphics/importer/array.cc \
    66                   lib/graphics/importer/objModel.cc \
    67                   lib/graphics/importer/md2Model.cc \
    68                   lib/graphics/importer/primitive_model.cc \
    69                   lib/graphics/importer/model.cc \
    70                   lib/graphics/importer/material.cc \
    71                   lib/graphics/importer/texture.cc \
    7267                  lib/lang/base_object.cc \
    7368                  lib/util/ini_parser.cc \
    … …  
    133128                 lib/graphics/light.h \
    134129                 lib/graphics/text_engine.h \
    135                  lib/graphics/importer/array.h \
    136                  lib/graphics/importer/abstract_model.h \
    137                  lib/graphics/importer/objModel.h \
    138                  lib/graphics/importer/md2Model.h \
    139                  lib/graphics/importer/primitive_model.h \
    140                  lib/graphics/importer/model.h \
    141                  lib/graphics/importer/material.h \
    142                  lib/graphics/importer/texture.h \
    143                  lib/graphics/importer/anorms.h \
    144                  lib/graphics/importer/anormtab.h \
    145130                 lib/lang/base_object.h \
    146131                 lib/util/ini_parser.h \

  • orxonox/trunk/src/Makefile.in

    r4556 r4564  
    6767        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
    6868        graphics_engine.$(OBJEXT) light.$(OBJEXT) \
    69         text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    70         md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
    71         material.$(OBJEXT) texture.$(OBJEXT) base_object.$(OBJEXT) \
     69        text_engine.$(OBJEXT) base_object.$(OBJEXT) \
    7270        ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \
    7371        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    … …  
    8179@AMDEP_TRUE@    ./$(DEPDIR)/animation3d.Po \
    8280@AMDEP_TRUE@    ./$(DEPDIR)/animation_player.Po \
    83 @AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_object.Po \
     81@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po \
    8482@AMDEP_TRUE@    ./$(DEPDIR)/benchmark.Po ./$(DEPDIR)/camera.Po \
    8583@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
    … …  
    9290@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
    9391@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/light.Po \
    94 @AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
    95 @AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
    96 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
     92@AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po \
     93@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po \
    9794@AMDEP_TRUE@    ./$(DEPDIR)/object_manager.Po \
    9895@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
    9996@AMDEP_TRUE@    ./$(DEPDIR)/pilot_node.Po ./$(DEPDIR)/player.Po \
    100 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    10197@AMDEP_TRUE@    ./$(DEPDIR)/projectile.Po \
    10298@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    … …  
    107103@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po \
    108104@AMDEP_TRUE@    ./$(DEPDIR)/test_entity.Po ./$(DEPDIR)/test_gun.Po \
    109 @AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po ./$(DEPDIR)/texture.Po \
     105@AMDEP_TRUE@    ./$(DEPDIR)/text_engine.Po \
    110106@AMDEP_TRUE@    ./$(DEPDIR)/track_manager.Po \
    111107@AMDEP_TRUE@    ./$(DEPDIR)/track_node.Po ./$(DEPDIR)/vector.Po \
    … …  
    240236MAINSRCDIR = .
    241237orxonox_DEPENDENCIES = lib/gui/libORXgui.a \
     238                       lib/graphics/importer/libORXimporter.a \
    242239                       lib/sound/libORXsound.a \
    243240                       lib/event/libORXevent.a \
    … …  
    248245
    249246orxonox_LDADD = lib/gui/libORXgui.a \
     247                lib/graphics/importer/libORXimporter.a \
    250248                lib/sound/libORXsound.a \
    251249                lib/event/libORXevent.a \
    … …  
    293291                  lib/graphics/light.cc \
    294292                  lib/graphics/text_engine.cc \
    295                   lib/graphics/importer/array.cc \
    296                   lib/graphics/importer/objModel.cc \
    297                   lib/graphics/importer/md2Model.cc \
    298                   lib/graphics/importer/primitive_model.cc \
    299                   lib/graphics/importer/model.cc \
    300                   lib/graphics/importer/material.cc \
    301                   lib/graphics/importer/texture.cc \
    302293                  lib/lang/base_object.cc \
    303294                  lib/util/ini_parser.cc \
    … …  
    363354                 lib/graphics/light.h \
    364355                 lib/graphics/text_engine.h \
    365                  lib/graphics/importer/array.h \
    366                  lib/graphics/importer/abstract_model.h \
    367                  lib/graphics/importer/objModel.h \
    368                  lib/graphics/importer/md2Model.h \
    369                  lib/graphics/importer/primitive_model.h \
    370                  lib/graphics/importer/model.h \
    371                  lib/graphics/importer/material.h \
    372                  lib/graphics/importer/texture.h \
    373                  lib/graphics/importer/anorms.h \
    374                  lib/graphics/importer/anormtab.h \
    375356                 lib/lang/base_object.h \
    376357                 lib/util/ini_parser.h \
    … …  
    465446@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animation3d.Po@am__quote@
    466447@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animation_player.Po@am__quote@
    467 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
    468448@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
    469449@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark.Po@am__quote@
    … …  
    482462@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/light.Po@am__quote@
    483463@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_param.Po@am__quote@
    484 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
    485 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
    486 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    487464@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
    488 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
    489465@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object_manager.Po@am__quote@
    490466@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
    … …  
    492468@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pilot_node.Po@am__quote@
    493469@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
    494 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
    495470@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectile.Po@am__quote@
    496471@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource_manager.Po@am__quote@
    … …  
    506481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gun.Po@am__quote@
    507482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text_engine.Po@am__quote@
    508 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
    509483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
    510484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_node.Po@am__quote@
    … …  
    11051079@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    11061080@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o text_engine.obj `if test -f 'lib/graphics/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine.cc'; fi`
    1107 
    1108 array.o: lib/graphics/importer/array.cc
    1109 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.o -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.o `test -f 'lib/graphics/importer/array.cc' || echo '$(srcdir)/'`lib/graphics/importer/array.cc; \
    1110 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
    1111 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/array.cc' object='array.o' libtool=no @AMDEPBACKSLASH@
    1112 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
    1113 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1114 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f 'lib/graphics/importer/array.cc' || echo '$(srcdir)/'`lib/graphics/importer/array.cc
    1115 
    1116 array.obj: lib/graphics/importer/array.cc
    1117 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT array.obj -MD -MP -MF "$(DEPDIR)/array.Tpo" -c -o array.obj `if test -f 'lib/graphics/importer/array.cc'; then $(CYGPATH_W) 'lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/array.cc'; fi`; \
    1118 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/array.Tpo" "$(DEPDIR)/array.Po"; else rm -f "$(DEPDIR)/array.Tpo"; exit 1; fi
    1119 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/array.cc' object='array.obj' libtool=no @AMDEPBACKSLASH@
    1120 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
    1121 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1122 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `if test -f 'lib/graphics/importer/array.cc'; then $(CYGPATH_W) 'lib/graphics/importer/array.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/array.cc'; fi`
    1123 
    1124 objModel.o: lib/graphics/importer/objModel.cc
    1125 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objModel.o -MD -MP -MF "$(DEPDIR)/objModel.Tpo" -c -o objModel.o `test -f 'lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`lib/graphics/importer/objModel.cc; \
    1126 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
    1127 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/objModel.cc' object='objModel.o' libtool=no @AMDEPBACKSLASH@
    1128 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
    1129 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1130 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.o `test -f 'lib/graphics/importer/objModel.cc' || echo '$(srcdir)/'`lib/graphics/importer/objModel.cc
    1131 
    1132 objModel.obj: lib/graphics/importer/objModel.cc
    1133 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT objModel.obj -MD -MP -MF "$(DEPDIR)/objModel.Tpo" -c -o objModel.obj `if test -f 'lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) 'lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/objModel.cc'; fi`; \
    1134 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/objModel.Tpo" "$(DEPDIR)/objModel.Po"; else rm -f "$(DEPDIR)/objModel.Tpo"; exit 1; fi
    1135 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/objModel.cc' object='objModel.obj' libtool=no @AMDEPBACKSLASH@
    1136 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/objModel.Po' tmpdepfile='$(DEPDIR)/objModel.TPo' @AMDEPBACKSLASH@
    1137 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1138 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f 'lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) 'lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/objModel.cc'; fi`
    1139 
    1140 md2Model.o: lib/graphics/importer/md2Model.cc
    1141 @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 'lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`lib/graphics/importer/md2Model.cc; \
    1142 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
    1143 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/md2Model.cc' object='md2Model.o' libtool=no @AMDEPBACKSLASH@
    1144 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.TPo' @AMDEPBACKSLASH@
    1145 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1146 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md2Model.o `test -f 'lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`lib/graphics/importer/md2Model.cc
    1147 
    1148 md2Model.obj: lib/graphics/importer/md2Model.cc
    1149 @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 'lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/md2Model.cc'; fi`; \
    1150 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
    1151 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/md2Model.cc' object='md2Model.obj' libtool=no @AMDEPBACKSLASH@
    1152 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.TPo' @AMDEPBACKSLASH@
    1153 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1154 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md2Model.obj `if test -f 'lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/md2Model.cc'; fi`
    1155 
    1156 primitive_model.o: lib/graphics/importer/primitive_model.cc
    1157 @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 'lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`lib/graphics/importer/primitive_model.cc; \
    1158 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
    1159 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/primitive_model.cc' object='primitive_model.o' libtool=no @AMDEPBACKSLASH@
    1160 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
    1161 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1162 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o primitive_model.o `test -f 'lib/graphics/importer/primitive_model.cc' || echo '$(srcdir)/'`lib/graphics/importer/primitive_model.cc
    1163 
    1164 primitive_model.obj: lib/graphics/importer/primitive_model.cc
    1165 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT primitive_model.obj -MD -MP -MF "$(DEPDIR)/primitive_model.Tpo" -c -o primitive_model.obj `if test -f 'lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/primitive_model.cc'; fi`; \
    1166 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/primitive_model.Tpo" "$(DEPDIR)/primitive_model.Po"; else rm -f "$(DEPDIR)/primitive_model.Tpo"; exit 1; fi
    1167 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/primitive_model.cc' object='primitive_model.obj' libtool=no @AMDEPBACKSLASH@
    1168 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/primitive_model.Po' tmpdepfile='$(DEPDIR)/primitive_model.TPo' @AMDEPBACKSLASH@
    1169 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1170 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o primitive_model.obj `if test -f 'lib/graphics/importer/primitive_model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/primitive_model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/primitive_model.cc'; fi`
    1171 
    1172 model.o: lib/graphics/importer/model.cc
    1173 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.o -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.o `test -f 'lib/graphics/importer/model.cc' || echo '$(srcdir)/'`lib/graphics/importer/model.cc; \
    1174 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
    1175 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/model.cc' object='model.o' libtool=no @AMDEPBACKSLASH@
    1176 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
    1177 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1178 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.o `test -f 'lib/graphics/importer/model.cc' || echo '$(srcdir)/'`lib/graphics/importer/model.cc
    1179 
    1180 model.obj: lib/graphics/importer/model.cc
    1181 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.obj -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.obj `if test -f 'lib/graphics/importer/model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/model.cc'; fi`; \
    1182 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
    1183 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/model.cc' object='model.obj' libtool=no @AMDEPBACKSLASH@
    1184 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
    1185 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1186 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.obj `if test -f 'lib/graphics/importer/model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/model.cc'; fi`
    1187 
    1188 material.o: lib/graphics/importer/material.cc
    1189 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.o -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.o `test -f 'lib/graphics/importer/material.cc' || echo '$(srcdir)/'`lib/graphics/importer/material.cc; \
    1190 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
    1191 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/material.cc' object='material.o' libtool=no @AMDEPBACKSLASH@
    1192 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
    1193 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1194 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.o `test -f 'lib/graphics/importer/material.cc' || echo '$(srcdir)/'`lib/graphics/importer/material.cc
    1195 
    1196 material.obj: lib/graphics/importer/material.cc
    1197 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT material.obj -MD -MP -MF "$(DEPDIR)/material.Tpo" -c -o material.obj `if test -f 'lib/graphics/importer/material.cc'; then $(CYGPATH_W) 'lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/material.cc'; fi`; \
    1198 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/material.Tpo" "$(DEPDIR)/material.Po"; else rm -f "$(DEPDIR)/material.Tpo"; exit 1; fi
    1199 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/material.cc' object='material.obj' libtool=no @AMDEPBACKSLASH@
    1200 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/material.Po' tmpdepfile='$(DEPDIR)/material.TPo' @AMDEPBACKSLASH@
    1201 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1202 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f 'lib/graphics/importer/material.cc'; then $(CYGPATH_W) 'lib/graphics/importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/material.cc'; fi`
    1203 
    1204 texture.o: lib/graphics/importer/texture.cc
    1205 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT texture.o -MD -MP -MF "$(DEPDIR)/texture.Tpo" -c -o texture.o `test -f 'lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`lib/graphics/importer/texture.cc; \
    1206 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
    1207 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/texture.cc' object='texture.o' libtool=no @AMDEPBACKSLASH@
    1208 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
    1209 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1210 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.o `test -f 'lib/graphics/importer/texture.cc' || echo '$(srcdir)/'`lib/graphics/importer/texture.cc
    1211 
    1212 texture.obj: lib/graphics/importer/texture.cc
    1213 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT texture.obj -MD -MP -MF "$(DEPDIR)/texture.Tpo" -c -o texture.obj `if test -f 'lib/graphics/importer/texture.cc'; then $(CYGPATH_W) 'lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/texture.cc'; fi`; \
    1214 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
    1215 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/texture.cc' object='texture.obj' libtool=no @AMDEPBACKSLASH@
    1216 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
    1217 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1218 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'lib/graphics/importer/texture.cc'; then $(CYGPATH_W) 'lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/texture.cc'; fi`
    12191081
    12201082base_object.o: lib/lang/base_object.cc
    … …  
    14521314
    14531315distdir: $(DISTFILES)
    1454         $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1316        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
    14551317        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14561318        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/lib/graphics/importer/Makefile.am

    r4264 r4564  
    11MAINSRCDIR=../../..
     2include $(MAINSRCDIR)/defs/include_paths.am
    23
    3 AM_LDFLAGS=$(MWINDOWS)
     4noinst_LIBRARIES = libORXimporter.a
     5
     6libORXimporter_a_SOURCES = model.cc \
     7                           objModel.cc \
     8                           primitive_model.cc \
     9                           md2Model.cc \
     10                           material.cc \
     11                           texture.cc \
     12                           array.cc
    413
    514
    615
    7 noinst_HEADERS= model.h \
    8                 objModel.h \
    9                 primitive_model.h \
    10                 array.h \
    11                 material.h \
    12                 texture.h
     16noinst_HEADERS = abstract_model.h \
     17                 model.h \
     18                 objModel.h \
     19                 primitive_model.h \
     20                 md2Model.h \
     21                 material.h \
     22                 texture.h \
     23                 array.h \
     24                 anorms.h \
     25                 anormtab.h

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r4506 r4564  
    1414
    1515@SET_MAKE@
     16
     17
     18SOURCES = $(libORXimporter_a_SOURCES)
    1619
    1720srcdir = @srcdir@
    … …  
    4649CONFIG_HEADER = $(top_builddir)/config.h
    4750CONFIG_CLEAN_FILES =
    48 SOURCES =
    49 DIST_SOURCES =
     51LIBRARIES = $(noinst_LIBRARIES)
     52AR = ar
     53ARFLAGS = cru
     54libORXimporter_a_AR = $(AR) $(ARFLAGS)
     55libORXimporter_a_LIBADD =
     56am_libORXimporter_a_OBJECTS = model.$(OBJEXT) objModel.$(OBJEXT) \
     57        primitive_model.$(OBJEXT) md2Model.$(OBJEXT) \
     58        material.$(OBJEXT) texture.$(OBJEXT) array.$(OBJEXT)
     59libORXimporter_a_OBJECTS = $(am_libORXimporter_a_OBJECTS)
     60DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
     61depcomp = $(SHELL) $(top_srcdir)/depcomp
     62am__depfiles_maybe = depfiles
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/material.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po
     68CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     69        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     70CXXLD = $(CXX)
     71CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     72        -o $@
     73SOURCES = $(libORXimporter_a_SOURCES)
     74DIST_SOURCES = $(libORXimporter_a_SOURCES)
    5075HEADERS = $(noinst_HEADERS)
    5176ETAGS = etags
    … …  
    161186target_vendor = @target_vendor@
    162187MAINSRCDIR = ../../..
    163 AM_LDFLAGS = $(MWINDOWS)
    164 noinst_HEADERS = model.h \
    165                 objModel.h \
    166                 primitive_model.h \
    167                 array.h \
    168                 material.h \
    169                 texture.h
     188noinst_LIBRARIES = libORXimporter.a
     189libORXimporter_a_SOURCES = model.cc \
     190                           objModel.cc \
     191                           primitive_model.cc \
     192                           md2Model.cc \
     193                           material.cc \
     194                           texture.cc \
     195                           array.cc
     196
     197noinst_HEADERS = abstract_model.h \
     198                 model.h \
     199                 objModel.h \
     200                 primitive_model.h \
     201                 md2Model.h \
     202                 material.h \
     203                 texture.h \
     204                 array.h \
     205                 anorms.h \
     206                 anormtab.h
    170207
    171208all: all-am
    172209
    173210.SUFFIXES:
     211.SUFFIXES: .cc .o .obj
    174212$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
    175213        @for dep in $?; do \
    … …  
    201239$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    202240        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
     241
     242clean-noinstLIBRARIES:
     243        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
     244libORXimporter.a: $(libORXimporter_a_OBJECTS) $(libORXimporter_a_DEPENDENCIES)
     245        -rm -f libORXimporter.a
     246        $(libORXimporter_a_AR) libORXimporter.a $(libORXimporter_a_OBJECTS) $(libORXimporter_a_LIBADD)
     247        $(RANLIB) libORXimporter.a
     248
     249mostlyclean-compile:
     250        -rm -f *.$(OBJEXT)
     251
     252distclean-compile:
     253        -rm -f *.tab.c
     254
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
     258@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
     259@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
     260@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@
     261@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
     262
     263.cc.o:
     264@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
     265@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     266@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     267@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     268@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     269@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ $<
     270
     271.cc.obj:
     272@am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
     273@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
     274@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     275@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
     276@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     277@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    203278uninstall-info-am:
    204279
    … …  
    280355check-am: all-am
    281356check: check-am
    282 all-am: Makefile $(HEADERS)
     357all-am: Makefile $(LIBRARIES) $(HEADERS)
    283358installdirs:
    284359install: install-am
    … …  
    308383clean: clean-am
    309384
    310 clean-am: clean-generic mostlyclean-am
     385clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
    311386
    312387distclean: distclean-am
     388        -rm -rf ./$(DEPDIR)
    313389        -rm -f Makefile
    314 distclean-am: clean-am distclean-generic distclean-tags
     390distclean-am: clean-am distclean-compile distclean-generic \
     391        distclean-tags
    315392
    316393dvi: dvi-am
    … …  
    335412
    336413maintainer-clean: maintainer-clean-am
     414        -rm -rf ./$(DEPDIR)
    337415        -rm -f Makefile
    338416maintainer-clean-am: distclean-am maintainer-clean-generic
    … …  
    340418mostlyclean: mostlyclean-am
    341419
    342 mostlyclean-am: mostlyclean-generic
     420mostlyclean-am: mostlyclean-compile mostlyclean-generic
    343421
    344422pdf: pdf-am
    … …  
    353431
    354432.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    355         ctags distclean distclean-generic distclean-tags distdir dvi \
    356         dvi-am html html-am info info-am install install-am \
    357         install-data install-data-am install-exec install-exec-am \
    358         install-info install-info-am install-man install-strip \
    359         installcheck installcheck-am installdirs maintainer-clean \
    360         maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
    361         pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am
    362 
     433        clean-noinstLIBRARIES ctags distclean distclean-compile \
     434        distclean-generic distclean-tags distdir dvi dvi-am html \
     435        html-am info info-am install install-am install-data \
     436        install-data-am install-exec install-exec-am install-info \
     437        install-info-am install-man install-strip installcheck \
     438        installcheck-am installdirs maintainer-clean \
     439        maintainer-clean-generic mostlyclean mostlyclean-compile \
     440        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
     441        uninstall-am uninstall-info-am
     442
     443include $(MAINSRCDIR)/defs/include_paths.am
    363444# Tell versions [3.59,3.63) of GNU make to not export all variables.
    364445# Otherwise a system limit (for SysV at least) may be exceeded.

  • orxonox/trunk/src/story_entities/world.cc

    r4558 r4564  
    506506  new PhysicsConnection(system, gravity);
    507507  //    new PhysicsConnection(this->localPlayer, gravity);
    508 
    509508
    510509  TestEntity* testEntity = new TestEntity();
Note: See TracChangeset for help on using the changeset viewer.