Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4527 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 7, 2005, 8:18:59 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: moved the collision_detection to the libs dir, and build it as a lib.

Location:
orxonox/trunk
Files:
6 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/configure

    r4506 r4527  
    87328732## OUTPUT CONFIGURE ##
    87338733######################
    8734                                                                                                                                                                 ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
     8734                                                                                                                                                                          ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/collision_detection/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
    87358735
    87368736
     
    93359335  "src/lib/physics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/physics/Makefile" ;;
    93369336  "src/lib/particles/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/particles/Makefile" ;;
     9337  "src/lib/collision_detection/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/collision_detection/Makefile" ;;
    93379338  "src/lib/gui/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/gui/Makefile" ;;
    93389339  "src/lib/tinyxml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/tinyxml/Makefile" ;;
  • orxonox/trunk/configure.ac

    r4506 r4527  
    593593                 src/lib/physics/Makefile
    594594                 src/lib/particles/Makefile
     595                 src/lib/collision_detection/Makefile
    595596                 src/lib/gui/Makefile
    596597                 src/lib/tinyxml/Makefile
  • orxonox/trunk/src/Makefile.am

    r4513 r4527  
    1313                       lib/physics/libORXphysics.a \
    1414                       lib/particles/libORXparticles.a \
     15                       lib/collision_detection/libORXcd.a \
    1516                       lib/tinyxml/libtinyxml.a
    1617
     
    2021                lib/physics/libORXphysics.a \
    2122                lib/particles/libORXparticles.a \
     23                lib/collision_detection/libORXcd.a \
    2224                lib/tinyxml/libtinyxml.a \
    2325                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     
    3840                 util/loading/load_param.cc \
    3941                 util/state.cc \
    40                  util/collision_detection/bounding_volume.cc \
    41                  util/collision_detection/obb.cc \
    42                  util/collision_detection/bounding_sphere.cc \
    43                  util/collision_detection/bv_tree.cc \
    44                  util/collision_detection/obb_tree.cc \
    45                  util/collision_detection/collision.cc \
    46                  util/collision_detection/cd_engine.cc \
    4742                 story_entities/story_entity.cc \
    4843                 story_entities/campaign.cc \
     
    10095                 util/loading/factory.h \
    10196                 util/loading/load_param.h \
    102                  util/collision_detection/bounding_volume.h \
    103                  util/collision_detection/obb.h \
    104                  util/collision_detection/bounding_sphere.h \
    105                  util/collision_detection/bv_tree.h \
    106                  util/collision_detection/obb_tree.h \
    107                  util/collision_detection/collision.h \
    108                  util/collision_detection/cd_engine.h \
    10997                 story_entities/story_entity.h \
    11098                 story_entities/story_def.h \
  • orxonox/trunk/src/Makefile.in

    r4513 r4527  
    5959        garbage_collector.$(OBJEXT) resource_manager.$(OBJEXT) \
    6060        factory.$(OBJEXT) load_param.$(OBJEXT) state.$(OBJEXT) \
    61         bounding_volume.$(OBJEXT) obb.$(OBJEXT) \
    62         bounding_sphere.$(OBJEXT) bv_tree.$(OBJEXT) obb_tree.$(OBJEXT) \
    63         collision.$(OBJEXT) cd_engine.$(OBJEXT) story_entity.$(OBJEXT) \
    64         campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
    65         camera.$(OBJEXT) player.$(OBJEXT) environment.$(OBJEXT) \
    66         skysphere.$(OBJEXT) skybox.$(OBJEXT) terrain.$(OBJEXT) \
    67         weapon.$(OBJEXT) projectile.$(OBJEXT) satellite.$(OBJEXT) \
    68         character_attributes.$(OBJEXT) test_gun.$(OBJEXT) \
    69         test_bullet.$(OBJEXT) test_entity.$(OBJEXT) p_node.$(OBJEXT) \
    70         null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
     61        story_entity.$(OBJEXT) campaign.$(OBJEXT) world.$(OBJEXT) \
     62        world_entity.$(OBJEXT) camera.$(OBJEXT) player.$(OBJEXT) \
     63        environment.$(OBJEXT) skysphere.$(OBJEXT) skybox.$(OBJEXT) \
     64        terrain.$(OBJEXT) weapon.$(OBJEXT) projectile.$(OBJEXT) \
     65        satellite.$(OBJEXT) character_attributes.$(OBJEXT) \
     66        test_gun.$(OBJEXT) test_bullet.$(OBJEXT) test_entity.$(OBJEXT) \
     67        p_node.$(OBJEXT) null_parent.$(OBJEXT) helper_parent.$(OBJEXT) \
    7168        graphics_engine.$(OBJEXT) light.$(OBJEXT) \
    7269        text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
     
    8582@AMDEP_TRUE@    ./$(DEPDIR)/animation_player.Po \
    8683@AMDEP_TRUE@    ./$(DEPDIR)/array.Po ./$(DEPDIR)/base_object.Po \
    87 @AMDEP_TRUE@    ./$(DEPDIR)/benchmark.Po \
    88 @AMDEP_TRUE@    ./$(DEPDIR)/bounding_sphere.Po \
    89 @AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Po ./$(DEPDIR)/camera.Po \
    91 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/cd_engine.Po \
     84@AMDEP_TRUE@    ./$(DEPDIR)/benchmark.Po ./$(DEPDIR)/camera.Po \
     85@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po \
    9286@AMDEP_TRUE@    ./$(DEPDIR)/character_attributes.Po \
    93 @AMDEP_TRUE@    ./$(DEPDIR)/collision.Po ./$(DEPDIR)/curve.Po \
    94 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po ./$(DEPDIR)/factory.Po \
    95 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
     87@AMDEP_TRUE@    ./$(DEPDIR)/curve.Po ./$(DEPDIR)/environment.Po \
     88@AMDEP_TRUE@    ./$(DEPDIR)/factory.Po ./$(DEPDIR)/game_loader.Po \
    9689@AMDEP_TRUE@    ./$(DEPDIR)/garbage_collector.Po \
    9790@AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
     
    10194@AMDEP_TRUE@    ./$(DEPDIR)/load_param.Po ./$(DEPDIR)/material.Po \
    10295@AMDEP_TRUE@    ./$(DEPDIR)/md2Model.Po ./$(DEPDIR)/model.Po \
    103 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/obb.Po \
    104 @AMDEP_TRUE@    ./$(DEPDIR)/obb_tree.Po ./$(DEPDIR)/objModel.Po \
     96@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    10597@AMDEP_TRUE@    ./$(DEPDIR)/object_manager.Po \
    10698@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
     
    252244                       lib/physics/libORXphysics.a \
    253245                       lib/particles/libORXparticles.a \
     246                       lib/collision_detection/libORXcd.a \
    254247                       lib/tinyxml/libtinyxml.a
    255248
     
    259252                lib/physics/libORXphysics.a \
    260253                lib/particles/libORXparticles.a \
     254                lib/collision_detection/libORXcd.a \
    261255                lib/tinyxml/libtinyxml.a \
    262256                $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
     
    276270                 util/loading/load_param.cc \
    277271                 util/state.cc \
    278                  util/collision_detection/bounding_volume.cc \
    279                  util/collision_detection/obb.cc \
    280                  util/collision_detection/bounding_sphere.cc \
    281                  util/collision_detection/bv_tree.cc \
    282                  util/collision_detection/obb_tree.cc \
    283                  util/collision_detection/collision.cc \
    284                  util/collision_detection/cd_engine.cc \
    285272                 story_entities/story_entity.cc \
    286273                 story_entities/campaign.cc \
     
    338325                 util/loading/factory.h \
    339326                 util/loading/load_param.h \
    340                  util/collision_detection/bounding_volume.h \
    341                  util/collision_detection/obb.h \
    342                  util/collision_detection/bounding_sphere.h \
    343                  util/collision_detection/bv_tree.h \
    344                  util/collision_detection/obb_tree.h \
    345                  util/collision_detection/collision.h \
    346                  util/collision_detection/cd_engine.h \
    347327                 story_entities/story_entity.h \
    348328                 story_entities/story_def.h \
     
    486466@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_object.Po@am__quote@
    487467@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/benchmark.Po@am__quote@
    488 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Po@am__quote@
    489 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Po@am__quote@
    490 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Po@am__quote@
    491468@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
    492469@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
    493 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Po@am__quote@
    494470@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/character_attributes.Po@am__quote@
    495 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
    496471@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
    497472@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
     
    509484@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    510485@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
    511 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Po@am__quote@
    512 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Po@am__quote@
    513486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/objModel.Po@am__quote@
    514487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object_manager.Po@am__quote@
     
    762735@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    763736@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o state.obj `if test -f 'util/state.cc'; then $(CYGPATH_W) 'util/state.cc'; else $(CYGPATH_W) '$(srcdir)/util/state.cc'; fi`
    764 
    765 bounding_volume.o: util/collision_detection/bounding_volume.cc
    766 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounding_volume.o -MD -MP -MF "$(DEPDIR)/bounding_volume.Tpo" -c -o bounding_volume.o `test -f 'util/collision_detection/bounding_volume.cc' || echo '$(srcdir)/'`util/collision_detection/bounding_volume.cc; \
    767 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bounding_volume.Tpo" "$(DEPDIR)/bounding_volume.Po"; else rm -f "$(DEPDIR)/bounding_volume.Tpo"; exit 1; fi
    768 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bounding_volume.cc' object='bounding_volume.o' libtool=no @AMDEPBACKSLASH@
    769 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bounding_volume.Po' tmpdepfile='$(DEPDIR)/bounding_volume.TPo' @AMDEPBACKSLASH@
    770 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    771 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounding_volume.o `test -f 'util/collision_detection/bounding_volume.cc' || echo '$(srcdir)/'`util/collision_detection/bounding_volume.cc
    772 
    773 bounding_volume.obj: util/collision_detection/bounding_volume.cc
    774 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounding_volume.obj -MD -MP -MF "$(DEPDIR)/bounding_volume.Tpo" -c -o bounding_volume.obj `if test -f 'util/collision_detection/bounding_volume.cc'; then $(CYGPATH_W) 'util/collision_detection/bounding_volume.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bounding_volume.cc'; fi`; \
    775 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bounding_volume.Tpo" "$(DEPDIR)/bounding_volume.Po"; else rm -f "$(DEPDIR)/bounding_volume.Tpo"; exit 1; fi
    776 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bounding_volume.cc' object='bounding_volume.obj' libtool=no @AMDEPBACKSLASH@
    777 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bounding_volume.Po' tmpdepfile='$(DEPDIR)/bounding_volume.TPo' @AMDEPBACKSLASH@
    778 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    779 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounding_volume.obj `if test -f 'util/collision_detection/bounding_volume.cc'; then $(CYGPATH_W) 'util/collision_detection/bounding_volume.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bounding_volume.cc'; fi`
    780 
    781 obb.o: util/collision_detection/obb.cc
    782 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT obb.o -MD -MP -MF "$(DEPDIR)/obb.Tpo" -c -o obb.o `test -f 'util/collision_detection/obb.cc' || echo '$(srcdir)/'`util/collision_detection/obb.cc; \
    783 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/obb.Tpo" "$(DEPDIR)/obb.Po"; else rm -f "$(DEPDIR)/obb.Tpo"; exit 1; fi
    784 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/obb.cc' object='obb.o' libtool=no @AMDEPBACKSLASH@
    785 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/obb.Po' tmpdepfile='$(DEPDIR)/obb.TPo' @AMDEPBACKSLASH@
    786 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    787 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obb.o `test -f 'util/collision_detection/obb.cc' || echo '$(srcdir)/'`util/collision_detection/obb.cc
    788 
    789 obb.obj: util/collision_detection/obb.cc
    790 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT obb.obj -MD -MP -MF "$(DEPDIR)/obb.Tpo" -c -o obb.obj `if test -f 'util/collision_detection/obb.cc'; then $(CYGPATH_W) 'util/collision_detection/obb.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/obb.cc'; fi`; \
    791 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/obb.Tpo" "$(DEPDIR)/obb.Po"; else rm -f "$(DEPDIR)/obb.Tpo"; exit 1; fi
    792 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/obb.cc' object='obb.obj' libtool=no @AMDEPBACKSLASH@
    793 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/obb.Po' tmpdepfile='$(DEPDIR)/obb.TPo' @AMDEPBACKSLASH@
    794 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    795 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obb.obj `if test -f 'util/collision_detection/obb.cc'; then $(CYGPATH_W) 'util/collision_detection/obb.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/obb.cc'; fi`
    796 
    797 bounding_sphere.o: util/collision_detection/bounding_sphere.cc
    798 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounding_sphere.o -MD -MP -MF "$(DEPDIR)/bounding_sphere.Tpo" -c -o bounding_sphere.o `test -f 'util/collision_detection/bounding_sphere.cc' || echo '$(srcdir)/'`util/collision_detection/bounding_sphere.cc; \
    799 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bounding_sphere.Tpo" "$(DEPDIR)/bounding_sphere.Po"; else rm -f "$(DEPDIR)/bounding_sphere.Tpo"; exit 1; fi
    800 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bounding_sphere.cc' object='bounding_sphere.o' libtool=no @AMDEPBACKSLASH@
    801 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bounding_sphere.Po' tmpdepfile='$(DEPDIR)/bounding_sphere.TPo' @AMDEPBACKSLASH@
    802 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    803 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounding_sphere.o `test -f 'util/collision_detection/bounding_sphere.cc' || echo '$(srcdir)/'`util/collision_detection/bounding_sphere.cc
    804 
    805 bounding_sphere.obj: util/collision_detection/bounding_sphere.cc
    806 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bounding_sphere.obj -MD -MP -MF "$(DEPDIR)/bounding_sphere.Tpo" -c -o bounding_sphere.obj `if test -f 'util/collision_detection/bounding_sphere.cc'; then $(CYGPATH_W) 'util/collision_detection/bounding_sphere.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bounding_sphere.cc'; fi`; \
    807 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bounding_sphere.Tpo" "$(DEPDIR)/bounding_sphere.Po"; else rm -f "$(DEPDIR)/bounding_sphere.Tpo"; exit 1; fi
    808 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bounding_sphere.cc' object='bounding_sphere.obj' libtool=no @AMDEPBACKSLASH@
    809 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bounding_sphere.Po' tmpdepfile='$(DEPDIR)/bounding_sphere.TPo' @AMDEPBACKSLASH@
    810 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    811 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bounding_sphere.obj `if test -f 'util/collision_detection/bounding_sphere.cc'; then $(CYGPATH_W) 'util/collision_detection/bounding_sphere.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bounding_sphere.cc'; fi`
    812 
    813 bv_tree.o: util/collision_detection/bv_tree.cc
    814 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bv_tree.o -MD -MP -MF "$(DEPDIR)/bv_tree.Tpo" -c -o bv_tree.o `test -f 'util/collision_detection/bv_tree.cc' || echo '$(srcdir)/'`util/collision_detection/bv_tree.cc; \
    815 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bv_tree.Tpo" "$(DEPDIR)/bv_tree.Po"; else rm -f "$(DEPDIR)/bv_tree.Tpo"; exit 1; fi
    816 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bv_tree.cc' object='bv_tree.o' libtool=no @AMDEPBACKSLASH@
    817 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bv_tree.Po' tmpdepfile='$(DEPDIR)/bv_tree.TPo' @AMDEPBACKSLASH@
    818 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    819 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bv_tree.o `test -f 'util/collision_detection/bv_tree.cc' || echo '$(srcdir)/'`util/collision_detection/bv_tree.cc
    820 
    821 bv_tree.obj: util/collision_detection/bv_tree.cc
    822 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bv_tree.obj -MD -MP -MF "$(DEPDIR)/bv_tree.Tpo" -c -o bv_tree.obj `if test -f 'util/collision_detection/bv_tree.cc'; then $(CYGPATH_W) 'util/collision_detection/bv_tree.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bv_tree.cc'; fi`; \
    823 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/bv_tree.Tpo" "$(DEPDIR)/bv_tree.Po"; else rm -f "$(DEPDIR)/bv_tree.Tpo"; exit 1; fi
    824 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/bv_tree.cc' object='bv_tree.obj' libtool=no @AMDEPBACKSLASH@
    825 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/bv_tree.Po' tmpdepfile='$(DEPDIR)/bv_tree.TPo' @AMDEPBACKSLASH@
    826 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    827 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bv_tree.obj `if test -f 'util/collision_detection/bv_tree.cc'; then $(CYGPATH_W) 'util/collision_detection/bv_tree.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/bv_tree.cc'; fi`
    828 
    829 obb_tree.o: util/collision_detection/obb_tree.cc
    830 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT obb_tree.o -MD -MP -MF "$(DEPDIR)/obb_tree.Tpo" -c -o obb_tree.o `test -f 'util/collision_detection/obb_tree.cc' || echo '$(srcdir)/'`util/collision_detection/obb_tree.cc; \
    831 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/obb_tree.Tpo" "$(DEPDIR)/obb_tree.Po"; else rm -f "$(DEPDIR)/obb_tree.Tpo"; exit 1; fi
    832 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/obb_tree.cc' object='obb_tree.o' libtool=no @AMDEPBACKSLASH@
    833 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/obb_tree.Po' tmpdepfile='$(DEPDIR)/obb_tree.TPo' @AMDEPBACKSLASH@
    834 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    835 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obb_tree.o `test -f 'util/collision_detection/obb_tree.cc' || echo '$(srcdir)/'`util/collision_detection/obb_tree.cc
    836 
    837 obb_tree.obj: util/collision_detection/obb_tree.cc
    838 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT obb_tree.obj -MD -MP -MF "$(DEPDIR)/obb_tree.Tpo" -c -o obb_tree.obj `if test -f 'util/collision_detection/obb_tree.cc'; then $(CYGPATH_W) 'util/collision_detection/obb_tree.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/obb_tree.cc'; fi`; \
    839 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/obb_tree.Tpo" "$(DEPDIR)/obb_tree.Po"; else rm -f "$(DEPDIR)/obb_tree.Tpo"; exit 1; fi
    840 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/obb_tree.cc' object='obb_tree.obj' libtool=no @AMDEPBACKSLASH@
    841 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/obb_tree.Po' tmpdepfile='$(DEPDIR)/obb_tree.TPo' @AMDEPBACKSLASH@
    842 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    843 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obb_tree.obj `if test -f 'util/collision_detection/obb_tree.cc'; then $(CYGPATH_W) 'util/collision_detection/obb_tree.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/obb_tree.cc'; fi`
    844 
    845 collision.o: util/collision_detection/collision.cc
    846 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision.o -MD -MP -MF "$(DEPDIR)/collision.Tpo" -c -o collision.o `test -f 'util/collision_detection/collision.cc' || echo '$(srcdir)/'`util/collision_detection/collision.cc; \
    847 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision.Tpo" "$(DEPDIR)/collision.Po"; else rm -f "$(DEPDIR)/collision.Tpo"; exit 1; fi
    848 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/collision.cc' object='collision.o' libtool=no @AMDEPBACKSLASH@
    849 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision.Po' tmpdepfile='$(DEPDIR)/collision.TPo' @AMDEPBACKSLASH@
    850 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    851 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision.o `test -f 'util/collision_detection/collision.cc' || echo '$(srcdir)/'`util/collision_detection/collision.cc
    852 
    853 collision.obj: util/collision_detection/collision.cc
    854 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision.obj -MD -MP -MF "$(DEPDIR)/collision.Tpo" -c -o collision.obj `if test -f 'util/collision_detection/collision.cc'; then $(CYGPATH_W) 'util/collision_detection/collision.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/collision.cc'; fi`; \
    855 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision.Tpo" "$(DEPDIR)/collision.Po"; else rm -f "$(DEPDIR)/collision.Tpo"; exit 1; fi
    856 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/collision.cc' object='collision.obj' libtool=no @AMDEPBACKSLASH@
    857 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision.Po' tmpdepfile='$(DEPDIR)/collision.TPo' @AMDEPBACKSLASH@
    858 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    859 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision.obj `if test -f 'util/collision_detection/collision.cc'; then $(CYGPATH_W) 'util/collision_detection/collision.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/collision.cc'; fi`
    860 
    861 cd_engine.o: util/collision_detection/cd_engine.cc
    862 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cd_engine.o -MD -MP -MF "$(DEPDIR)/cd_engine.Tpo" -c -o cd_engine.o `test -f 'util/collision_detection/cd_engine.cc' || echo '$(srcdir)/'`util/collision_detection/cd_engine.cc; \
    863 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/cd_engine.Tpo" "$(DEPDIR)/cd_engine.Po"; else rm -f "$(DEPDIR)/cd_engine.Tpo"; exit 1; fi
    864 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/cd_engine.cc' object='cd_engine.o' libtool=no @AMDEPBACKSLASH@
    865 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/cd_engine.Po' tmpdepfile='$(DEPDIR)/cd_engine.TPo' @AMDEPBACKSLASH@
    866 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    867 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cd_engine.o `test -f 'util/collision_detection/cd_engine.cc' || echo '$(srcdir)/'`util/collision_detection/cd_engine.cc
    868 
    869 cd_engine.obj: util/collision_detection/cd_engine.cc
    870 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cd_engine.obj -MD -MP -MF "$(DEPDIR)/cd_engine.Tpo" -c -o cd_engine.obj `if test -f 'util/collision_detection/cd_engine.cc'; then $(CYGPATH_W) 'util/collision_detection/cd_engine.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/cd_engine.cc'; fi`; \
    871 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/cd_engine.Tpo" "$(DEPDIR)/cd_engine.Po"; else rm -f "$(DEPDIR)/cd_engine.Tpo"; exit 1; fi
    872 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='util/collision_detection/cd_engine.cc' object='cd_engine.obj' libtool=no @AMDEPBACKSLASH@
    873 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/cd_engine.Po' tmpdepfile='$(DEPDIR)/cd_engine.TPo' @AMDEPBACKSLASH@
    874 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    875 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cd_engine.obj `if test -f 'util/collision_detection/cd_engine.cc'; then $(CYGPATH_W) 'util/collision_detection/cd_engine.cc'; else $(CYGPATH_W) '$(srcdir)/util/collision_detection/cd_engine.cc'; fi`
    876737
    877738story_entity.o: story_entities/story_entity.cc
     
    15891450
    15901451distdir: $(DISTFILES)
    1591         $(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/collision_detection $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1452        $(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
    15921453        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    15931454        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • orxonox/trunk/src/lib/Makefile.am

    r4506 r4527  
    77          physics \
    88          particles \
     9          collision_detection \
    910          tinyxml \
    1011          $(GTK_PROGS)
  • orxonox/trunk/src/lib/Makefile.in

    r4506 r4527  
    172172          physics \
    173173          particles \
     174          collision_detection \
    174175          tinyxml \
    175176          $(GTK_PROGS)
  • orxonox/trunk/src/lib/collision_detection/Makefile.am

    r4526 r4527  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXevent.a
     4noinst_LIBRARIES = libORXcd.a
    55
    6 libORXevent_a_SOURCES = event.cc \
    7                         event_handler.cc \
    8                         event_listener.cc \
    9                         key_mapper.cc \
    10                         key_names.cc
     6libORXcd_a_SOURCES = cd_engine.cc \
     7                     collision.cc \
     8                     obb.cc \
     9                     obb_tree.cc \
     10                     bv_tree.cc \
     11                     bounding_volume.cc \
     12                     bounding_sphere.cc
    1113
    1214
    13 noinst_HEADERS = event.h \
    14                  event_handler.h \
    15                  event_listener.h \
    16                  key_mapper.h \
    17                  key_names.h \
    18                  event_def.h
    1915
     16noinst_HEADERS =     cd_engine.h \
     17                     collision.h \
     18                     obb.h \
     19                     obb_tree.h \
     20                     bv_tree.h \
     21                     bounding_volume.h \
     22                     bounding_sphere.h
     23
  • orxonox/trunk/src/lib/collision_detection/Makefile.in

    r4526 r4527  
    1616
    1717
    18 SOURCES = $(libORXevent_a_SOURCES)
     18SOURCES = $(libORXcd_a_SOURCES)
    1919
    2020srcdir = @srcdir@
     
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 subdir = src/lib/event
     41subdir = src/lib/collision_detection
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4343        $(srcdir)/Makefile.in
     
    5252AR = ar
    5353ARFLAGS = cru
    54 libORXevent_a_AR = $(AR) $(ARFLAGS)
    55 libORXevent_a_LIBADD =
    56 am_libORXevent_a_OBJECTS = event.$(OBJEXT) event_handler.$(OBJEXT) \
    57         event_listener.$(OBJEXT) key_mapper.$(OBJEXT) \
    58         key_names.$(OBJEXT)
    59 libORXevent_a_OBJECTS = $(am_libORXevent_a_OBJECTS)
     54libORXcd_a_AR = $(AR) $(ARFLAGS)
     55libORXcd_a_LIBADD =
     56am_libORXcd_a_OBJECTS = cd_engine.$(OBJEXT) collision.$(OBJEXT) \
     57        obb.$(OBJEXT) obb_tree.$(OBJEXT) bv_tree.$(OBJEXT) \
     58        bounding_volume.$(OBJEXT) bounding_sphere.$(OBJEXT)
     59libORXcd_a_OBJECTS = $(am_libORXcd_a_OBJECTS)
    6060DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6161depcomp = $(SHELL) $(top_srcdir)/depcomp
    6262am__depfiles_maybe = depfiles
    63 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/event.Po \
    64 @AMDEP_TRUE@    ./$(DEPDIR)/event_handler.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/event_listener.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/key_mapper.Po ./$(DEPDIR)/key_names.Po
     63@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bounding_sphere.Po \
     64@AMDEP_TRUE@    ./$(DEPDIR)/bounding_volume.Po \
     65@AMDEP_TRUE@    ./$(DEPDIR)/bv_tree.Po ./$(DEPDIR)/cd_engine.Po \
     66@AMDEP_TRUE@    ./$(DEPDIR)/collision.Po ./$(DEPDIR)/obb.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/obb_tree.Po
    6768CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6869        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     
    7071CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    7172        -o $@
    72 SOURCES = $(libORXevent_a_SOURCES)
    73 DIST_SOURCES = $(libORXevent_a_SOURCES)
     73SOURCES = $(libORXcd_a_SOURCES)
     74DIST_SOURCES = $(libORXcd_a_SOURCES)
    7475HEADERS = $(noinst_HEADERS)
    7576ETAGS = etags
     
    185186target_vendor = @target_vendor@
    186187MAINSRCDIR = ../..
    187 noinst_LIBRARIES = libORXevent.a
    188 libORXevent_a_SOURCES = event.cc \
    189                         event_handler.cc \
    190                         event_listener.cc \
    191                         key_mapper.cc \
    192                         key_names.cc
    193 
    194 noinst_HEADERS = event.h \
    195                  event_handler.h \
    196                  event_listener.h \
    197                  key_mapper.h \
    198                  key_names.h \
    199                  event_def.h
     188noinst_LIBRARIES = libORXcd.a
     189libORXcd_a_SOURCES = cd_engine.cc \
     190                     collision.cc \
     191                     obb.cc \
     192                     obb_tree.cc \
     193                     bv_tree.cc \
     194                     bounding_volume.cc \
     195                     bounding_sphere.cc
     196
     197noinst_HEADERS = cd_engine.h \
     198                     collision.h \
     199                     obb.h \
     200                     obb_tree.h \
     201                     bv_tree.h \
     202                     bounding_volume.h \
     203                     bounding_sphere.h
    200204
    201205all: all-am
     
    212216          esac; \
    213217        done; \
    214         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
     218        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
    215219        cd $(top_srcdir) && \
    216           $(AUTOMAKE) --foreign  src/lib/event/Makefile
     220          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
    217221.PRECIOUS: Makefile
    218222Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     
    235239clean-noinstLIBRARIES:
    236240        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    237 libORXevent.a: $(libORXevent_a_OBJECTS) $(libORXevent_a_DEPENDENCIES)
    238         -rm -f libORXevent.a
    239         $(libORXevent_a_AR) libORXevent.a $(libORXevent_a_OBJECTS) $(libORXevent_a_LIBADD)
    240         $(RANLIB) libORXevent.a
     241libORXcd.a: $(libORXcd_a_OBJECTS) $(libORXcd_a_DEPENDENCIES)
     242        -rm -f libORXcd.a
     243        $(libORXcd_a_AR) libORXcd.a $(libORXcd_a_OBJECTS) $(libORXcd_a_LIBADD)
     244        $(RANLIB) libORXcd.a
    241245
    242246mostlyclean-compile:
     
    246250        -rm -f *.tab.c
    247251
    248 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
    249 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_handler.Po@am__quote@
    250 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event_listener.Po@am__quote@
    251 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_mapper.Po@am__quote@
    252 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/key_names.Po@am__quote@
     252@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_sphere.Po@am__quote@
     253@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bounding_volume.Po@am__quote@
     254@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bv_tree.Po@am__quote@
     255@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_engine.Po@am__quote@
     256@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
     257@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb.Po@am__quote@
     258@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/obb_tree.Po@am__quote@
    253259
    254260.cc.o:
Note: See TracChangeset for help on using the changeset viewer.