Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 20, 2005, 10:47:03 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: subprojects (without gui) work again

Location:
orxonox/trunk/src/subprojects/collision_detection
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r4751 r4908  
    1111                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
    1212                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     13                  $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
    1314                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    1415
    … …  
    2728                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    2829                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     30                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     31                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    2932                   $(MAINSRCDIR)/util/state.cc \
    3033                   $(MAINSRCDIR)/lib/lang/base_object.cc \
    … …  
    4144                   $(MAINSRCDIR)/util/animation/animation3d.cc \
    4245                   $(MAINSRCDIR)/util/loading/factory.cc \
    43                    $(MAINSRCDIR)/world_entities/world_entity.cc
     46                   $(MAINSRCDIR)/world_entities/world_entity.cc \
     47                   $(MAINSRCDIR)/world_entities/terrain.cc
    4448
     49

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

    r4826 r4908  
    5656        collision-ini_parser.$(OBJEXT) collision-camera.$(OBJEXT) \
    5757        collision-light.$(OBJEXT) collision-text_engine.$(OBJEXT) \
    58         collision-graphics_engine.$(OBJEXT) collision-state.$(OBJEXT) \
    59         collision-base_object.$(OBJEXT) collision-class_list.$(OBJEXT) \
    60         collision-vector.$(OBJEXT) \
     58        collision-graphics_engine.$(OBJEXT) \
     59        collision-render_2d.$(OBJEXT) collision-element_2d.$(OBJEXT) \
     60        collision-state.$(OBJEXT) collision-base_object.$(OBJEXT) \
     61        collision-class_list.$(OBJEXT) collision-vector.$(OBJEXT) \
    6162        collision-resource_manager.$(OBJEXT) \
    6263        collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \
    … …  
    6566        collision-animation_player.$(OBJEXT) \
    6667        collision-animation3d.$(OBJEXT) collision-factory.$(OBJEXT) \
    67         collision-world_entity.$(OBJEXT)
     68        collision-world_entity.$(OBJEXT) collision-terrain.$(OBJEXT)
    6869collision_OBJECTS = $(am_collision_OBJECTS)
    6970am__DEPENDENCIES_1 =
    … …  
    7374        $(MAINSRCDIR)/lib/event/libORXevent.a \
    7475        $(MAINSRCDIR)/lib/sound/libORXsound.a \
    75         $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a $(am__DEPENDENCIES_1) \
    76         $(am__DEPENDENCIES_1)
     76        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     77        $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
     78        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
    7779DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    7880depcomp = $(SHELL) $(top_srcdir)/depcomp
    … …  
    8587@AMDEP_TRUE@    ./$(DEPDIR)/collision-class_list.Po \
    8688@AMDEP_TRUE@    ./$(DEPDIR)/collision-collision_detection.Po \
     89@AMDEP_TRUE@    ./$(DEPDIR)/collision-element_2d.Po \
    8790@AMDEP_TRUE@    ./$(DEPDIR)/collision-environment.Po \
    8891@AMDEP_TRUE@    ./$(DEPDIR)/collision-factory.Po \
    … …  
    9598@AMDEP_TRUE@    ./$(DEPDIR)/collision-null_parent.Po \
    9699@AMDEP_TRUE@    ./$(DEPDIR)/collision-p_node.Po \
     100@AMDEP_TRUE@    ./$(DEPDIR)/collision-render_2d.Po \
    97101@AMDEP_TRUE@    ./$(DEPDIR)/collision-resource_manager.Po \
    98102@AMDEP_TRUE@    ./$(DEPDIR)/collision-state.Po \
    99103@AMDEP_TRUE@    ./$(DEPDIR)/collision-substring.Po \
     104@AMDEP_TRUE@    ./$(DEPDIR)/collision-terrain.Po \
    100105@AMDEP_TRUE@    ./$(DEPDIR)/collision-test_entity.Po \
    101106@AMDEP_TRUE@    ./$(DEPDIR)/collision-text_engine.Po \
    … …  
    227232                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
    228233                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     234                  $(MAINSRCDIR)/lib/graphics/spatial_separation/libORXquadtree.a \
    229235                  $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    230236
    … …  
    241247                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    242248                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     249                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     250                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    243251                   $(MAINSRCDIR)/util/state.cc \
    244252                   $(MAINSRCDIR)/lib/lang/base_object.cc \
    … …  
    255263                   $(MAINSRCDIR)/util/animation/animation3d.cc \
    256264                   $(MAINSRCDIR)/util/loading/factory.cc \
    257                    $(MAINSRCDIR)/world_entities/world_entity.cc
     265                   $(MAINSRCDIR)/world_entities/world_entity.cc \
     266                   $(MAINSRCDIR)/world_entities/terrain.cc
    258267
    259268all: all-am
    … …  
    330339@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-class_list.Po@am__quote@
    331340@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
     341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-element_2d.Po@am__quote@
    332342@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
    333343@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-factory.Po@am__quote@
    … …  
    340350@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-null_parent.Po@am__quote@
    341351@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-p_node.Po@am__quote@
     352@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-render_2d.Po@am__quote@
    342353@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-resource_manager.Po@am__quote@
    343354@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-state.Po@am__quote@
    344355@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-substring.Po@am__quote@
     356@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-terrain.Po@am__quote@
    345357@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-test_entity.Po@am__quote@
    346358@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-text_engine.Po@am__quote@
    … …  
    508520@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-graphics_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/graphics_engine.cc'; fi`
    509521
     522collision-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     523@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-render_2d.o -MD -MP -MF "$(DEPDIR)/collision-render_2d.Tpo" -c -o collision-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
     524@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-render_2d.Tpo" "$(DEPDIR)/collision-render_2d.Po"; else rm -f "$(DEPDIR)/collision-render_2d.Tpo"; exit 1; fi
     525@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.o' libtool=no @AMDEPBACKSLASH@
     526@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
     527@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     528@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     529
     530collision-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     531@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-render_2d.obj -MD -MP -MF "$(DEPDIR)/collision-render_2d.Tpo" -c -o collision-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`; \
     532@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-render_2d.Tpo" "$(DEPDIR)/collision-render_2d.Po"; else rm -f "$(DEPDIR)/collision-render_2d.Tpo"; exit 1; fi
     533@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.obj' libtool=no @AMDEPBACKSLASH@
     534@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
     535@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     536@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-render_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc'; fi`
     537
     538collision-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     539@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-element_2d.o -MD -MP -MF "$(DEPDIR)/collision-element_2d.Tpo" -c -o collision-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
     540@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-element_2d.Tpo" "$(DEPDIR)/collision-element_2d.Po"; else rm -f "$(DEPDIR)/collision-element_2d.Tpo"; exit 1; fi
     541@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.o' libtool=no @AMDEPBACKSLASH@
     542@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
     543@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     544@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     545
     546collision-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     547@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-element_2d.obj -MD -MP -MF "$(DEPDIR)/collision-element_2d.Tpo" -c -o collision-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`; \
     548@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-element_2d.Tpo" "$(DEPDIR)/collision-element_2d.Po"; else rm -f "$(DEPDIR)/collision-element_2d.Tpo"; exit 1; fi
     549@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.obj' libtool=no @AMDEPBACKSLASH@
     550@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
     551@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     552@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-element_2d.obj `if test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc'; fi`
     553
    510554collision-state.o: $(MAINSRCDIR)/util/state.cc
    511555@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-state.o -MD -MP -MF "$(DEPDIR)/collision-state.Tpo" -c -o collision-state.o `test -f '$(MAINSRCDIR)/util/state.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/util/state.cc; \
    … …  
    747791@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    748792@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-world_entity.obj `if test -f '$(MAINSRCDIR)/world_entities/world_entity.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/world_entity.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/world_entity.cc'; fi`
     793
     794collision-terrain.o: $(MAINSRCDIR)/world_entities/terrain.cc
     795@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-terrain.o -MD -MP -MF "$(DEPDIR)/collision-terrain.Tpo" -c -o collision-terrain.o `test -f '$(MAINSRCDIR)/world_entities/terrain.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/terrain.cc; \
     796@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-terrain.Tpo" "$(DEPDIR)/collision-terrain.Po"; else rm -f "$(DEPDIR)/collision-terrain.Tpo"; exit 1; fi
     797@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/world_entities/terrain.cc' object='collision-terrain.o' libtool=no @AMDEPBACKSLASH@
     798@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-terrain.Po' tmpdepfile='$(DEPDIR)/collision-terrain.TPo' @AMDEPBACKSLASH@
     799@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     800@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-terrain.o `test -f '$(MAINSRCDIR)/world_entities/terrain.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/world_entities/terrain.cc
     801
     802collision-terrain.obj: $(MAINSRCDIR)/world_entities/terrain.cc
     803@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-terrain.obj -MD -MP -MF "$(DEPDIR)/collision-terrain.Tpo" -c -o collision-terrain.obj `if test -f '$(MAINSRCDIR)/world_entities/terrain.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/terrain.cc'; fi`; \
     804@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-terrain.Tpo" "$(DEPDIR)/collision-terrain.Po"; else rm -f "$(DEPDIR)/collision-terrain.Tpo"; exit 1; fi
     805@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/world_entities/terrain.cc' object='collision-terrain.obj' libtool=no @AMDEPBACKSLASH@
     806@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-terrain.Po' tmpdepfile='$(DEPDIR)/collision-terrain.TPo' @AMDEPBACKSLASH@
     807@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     808@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-terrain.obj `if test -f '$(MAINSRCDIR)/world_entities/terrain.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/terrain.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/terrain.cc'; fi`
    749809uninstall-info-am:
    750810
Note: See TracChangeset for help on using the changeset viewer.