Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4908 in orxonox.OLD


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
Files:
8 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

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

    r4770 r4908  
    99
    1010gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/libORXgui.a \
    11                    $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
     11                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     12                   $(MAINSRCDIR)/lib/event/libORXevent.a
    1213
    1314gui_CPPFLAGS = -DNO_AUDIO -DNO_MODEL -DNO_TEXTURES -DNO_TEXT
    … …  
    1920gui_SOURCES= gui_main.cc \
    2021             $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     22             $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     23             $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    2124             $(MAINSRCDIR)/lib/lang/base_object.cc \
    2225             $(MAINSRCDIR)/lib/lang/class_list.cc \

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

    r4826 r4908  
    5454PROGRAMS = $(bin_PROGRAMS)
    5555am_gui_OBJECTS = gui-gui_main.$(OBJEXT) gui-graphics_engine.$(OBJEXT) \
     56        gui-render_2d.$(OBJEXT) gui-element_2d.$(OBJEXT) \
    5657        gui-base_object.$(OBJEXT) gui-class_list.$(OBJEXT) \
    5758        gui-vector.$(OBJEXT) gui-resource_manager.$(OBJEXT) \
    … …  
    6566@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gui-base_object.Po \
    6667@AMDEP_TRUE@    ./$(DEPDIR)/gui-class_list.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/gui-element_2d.Po \
    6769@AMDEP_TRUE@    ./$(DEPDIR)/gui-graphics_engine.Po \
    6870@AMDEP_TRUE@    ./$(DEPDIR)/gui-gui_main.Po \
    6971@AMDEP_TRUE@    ./$(DEPDIR)/gui-ini_parser.Po \
    7072@AMDEP_TRUE@    ./$(DEPDIR)/gui-load_param.Po \
     73@AMDEP_TRUE@    ./$(DEPDIR)/gui-render_2d.Po \
    7174@AMDEP_TRUE@    ./$(DEPDIR)/gui-resource_manager.Po \
    7275@AMDEP_TRUE@    ./$(DEPDIR)/gui-substring.Po \
    … …  
    194197AM_LDFLAGS = $(MWINDOWS)
    195198gui_DEPENDENCIES = $(MAINSRCDIR)/lib/gui/libORXgui.a \
    196                    $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a
     199                   $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     200                   $(MAINSRCDIR)/lib/event/libORXevent.a
    197201
    198202gui_CPPFLAGS = -DNO_AUDIO -DNO_MODEL -DNO_TEXTURES -DNO_TEXT
    … …  
    203207gui_SOURCES = gui_main.cc \
    204208             $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
     209             $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     210             $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    205211             $(MAINSRCDIR)/lib/lang/base_object.cc \
    206212             $(MAINSRCDIR)/lib/lang/class_list.cc \
    … …  
    280286@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-base_object.Po@am__quote@
    281287@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-class_list.Po@am__quote@
     288@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-element_2d.Po@am__quote@
    282289@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-graphics_engine.Po@am__quote@
    283290@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-gui_main.Po@am__quote@
    284291@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-ini_parser.Po@am__quote@
    285292@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-load_param.Po@am__quote@
     293@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-render_2d.Po@am__quote@
    286294@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-resource_manager.Po@am__quote@
    287295@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-substring.Po@am__quote@
    … …  
    335343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    336344@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-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`
     345
     346gui-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     347@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-render_2d.o -MD -MP -MF "$(DEPDIR)/gui-render_2d.Tpo" -c -o gui-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
     348@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-render_2d.Tpo" "$(DEPDIR)/gui-render_2d.Po"; else rm -f "$(DEPDIR)/gui-render_2d.Tpo"; exit 1; fi
     349@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='gui-render_2d.o' libtool=no @AMDEPBACKSLASH@
     350@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-render_2d.Po' tmpdepfile='$(DEPDIR)/gui-render_2d.TPo' @AMDEPBACKSLASH@
     351@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     352@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     353
     354gui-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     355@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-render_2d.obj -MD -MP -MF "$(DEPDIR)/gui-render_2d.Tpo" -c -o gui-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`; \
     356@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-render_2d.Tpo" "$(DEPDIR)/gui-render_2d.Po"; else rm -f "$(DEPDIR)/gui-render_2d.Tpo"; exit 1; fi
     357@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='gui-render_2d.obj' libtool=no @AMDEPBACKSLASH@
     358@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-render_2d.Po' tmpdepfile='$(DEPDIR)/gui-render_2d.TPo' @AMDEPBACKSLASH@
     359@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     360@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-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`
     361
     362gui-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     363@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-element_2d.o -MD -MP -MF "$(DEPDIR)/gui-element_2d.Tpo" -c -o gui-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
     364@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-element_2d.Tpo" "$(DEPDIR)/gui-element_2d.Po"; else rm -f "$(DEPDIR)/gui-element_2d.Tpo"; exit 1; fi
     365@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='gui-element_2d.o' libtool=no @AMDEPBACKSLASH@
     366@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-element_2d.Po' tmpdepfile='$(DEPDIR)/gui-element_2d.TPo' @AMDEPBACKSLASH@
     367@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     368@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     369
     370gui-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     371@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gui-element_2d.obj -MD -MP -MF "$(DEPDIR)/gui-element_2d.Tpo" -c -o gui-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`; \
     372@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gui-element_2d.Tpo" "$(DEPDIR)/gui-element_2d.Po"; else rm -f "$(DEPDIR)/gui-element_2d.Tpo"; exit 1; fi
     373@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='gui-element_2d.obj' libtool=no @AMDEPBACKSLASH@
     374@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gui-element_2d.Po' tmpdepfile='$(DEPDIR)/gui-element_2d.TPo' @AMDEPBACKSLASH@
     375@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     376@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gui_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gui-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`
    337377
    338378gui-base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc

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

    r4751 r4908  
    2525                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
    2626                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     27                  $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     28                  $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    2729                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    2830                  $(MAINSRCDIR)/lib/coord/null_parent.cc \

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

    r4826 r4908  
    5858        importer-vector.$(OBJEXT) importer-resource_manager.$(OBJEXT) \
    5959        importer-ini_parser.$(OBJEXT) importer-text_engine.$(OBJEXT) \
     60        importer-render_2d.$(OBJEXT) importer-element_2d.$(OBJEXT) \
    6061        importer-p_node.$(OBJEXT) importer-null_parent.$(OBJEXT) \
    6162        importer-load_param.$(OBJEXT) importer-substring.$(OBJEXT) \
    … …  
    7273@AMDEP_TRUE@    ./$(DEPDIR)/importer-camera.Po \
    7374@AMDEP_TRUE@    ./$(DEPDIR)/importer-class_list.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/importer-element_2d.Po \
    7476@AMDEP_TRUE@    ./$(DEPDIR)/importer-factory.Po \
    7577@AMDEP_TRUE@    ./$(DEPDIR)/importer-framework.Po \
    … …  
    8183@AMDEP_TRUE@    ./$(DEPDIR)/importer-null_parent.Po \
    8284@AMDEP_TRUE@    ./$(DEPDIR)/importer-p_node.Po \
     85@AMDEP_TRUE@    ./$(DEPDIR)/importer-render_2d.Po \
    8386@AMDEP_TRUE@    ./$(DEPDIR)/importer-resource_manager.Po \
    8487@AMDEP_TRUE@    ./$(DEPDIR)/importer-state.Po \
    … …  
    224227                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
    225228                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     229                  $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     230                  $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    226231                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    227232                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
    … …  
    299304@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-camera.Po@am__quote@
    300305@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-class_list.Po@am__quote@
     306@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-element_2d.Po@am__quote@
    301307@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-factory.Po@am__quote@
    302308@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-framework.Po@am__quote@
    … …  
    308314@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-null_parent.Po@am__quote@
    309315@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-p_node.Po@am__quote@
     316@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-render_2d.Po@am__quote@
    310317@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-resource_manager.Po@am__quote@
    311318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-state.Po@am__quote@
    … …  
    521528@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    522529@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
     530
     531importer-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     532@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-render_2d.o -MD -MP -MF "$(DEPDIR)/importer-render_2d.Tpo" -c -o importer-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
     533@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-render_2d.Tpo" "$(DEPDIR)/importer-render_2d.Po"; else rm -f "$(DEPDIR)/importer-render_2d.Tpo"; exit 1; fi
     534@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.o' libtool=no @AMDEPBACKSLASH@
     535@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
     536@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     537@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     538
     539importer-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     540@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-render_2d.obj -MD -MP -MF "$(DEPDIR)/importer-render_2d.Tpo" -c -o importer-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`; \
     541@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-render_2d.Tpo" "$(DEPDIR)/importer-render_2d.Po"; else rm -f "$(DEPDIR)/importer-render_2d.Tpo"; exit 1; fi
     542@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.obj' libtool=no @AMDEPBACKSLASH@
     543@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
     544@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     545@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-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`
     546
     547importer-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     548@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-element_2d.o -MD -MP -MF "$(DEPDIR)/importer-element_2d.Tpo" -c -o importer-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
     549@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-element_2d.Tpo" "$(DEPDIR)/importer-element_2d.Po"; else rm -f "$(DEPDIR)/importer-element_2d.Tpo"; exit 1; fi
     550@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.o' libtool=no @AMDEPBACKSLASH@
     551@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
     552@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     553@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     554
     555importer-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     556@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-element_2d.obj -MD -MP -MF "$(DEPDIR)/importer-element_2d.Tpo" -c -o importer-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`; \
     557@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-element_2d.Tpo" "$(DEPDIR)/importer-element_2d.Po"; else rm -f "$(DEPDIR)/importer-element_2d.Tpo"; exit 1; fi
     558@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.obj' libtool=no @AMDEPBACKSLASH@
     559@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
     560@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     561@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-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`
    523562
    524563importer-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc

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

    r4751 r4908  
    2929                   $(MAINSRCDIR)/util/resource_manager.cc \
    3030                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     31                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     32                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    3133                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    3234                   $(MAINSRCDIR)/lib/coord/null_parent.cc \

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

    r4826 r4908  
    5959        particles-vector.$(OBJEXT) \
    6060        particles-resource_manager.$(OBJEXT) \
    61         particles-text_engine.$(OBJEXT) particles-p_node.$(OBJEXT) \
     61        particles-text_engine.$(OBJEXT) particles-render_2d.$(OBJEXT) \
     62        particles-element_2d.$(OBJEXT) particles-p_node.$(OBJEXT) \
    6263        particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT) \
    6364        particles-substring.$(OBJEXT) particles-load_param.$(OBJEXT) \
    … …  
    7980@AMDEP_TRUE@    ./$(DEPDIR)/particles-camera.Po \
    8081@AMDEP_TRUE@    ./$(DEPDIR)/particles-class_list.Po \
     82@AMDEP_TRUE@    ./$(DEPDIR)/particles-element_2d.Po \
    8183@AMDEP_TRUE@    ./$(DEPDIR)/particles-factory.Po \
    8284@AMDEP_TRUE@    ./$(DEPDIR)/particles-framework.Po \
    … …  
    8991@AMDEP_TRUE@    ./$(DEPDIR)/particles-p_node.Po \
    9092@AMDEP_TRUE@    ./$(DEPDIR)/particles-particle_fun.Po \
     93@AMDEP_TRUE@    ./$(DEPDIR)/particles-render_2d.Po \
    9194@AMDEP_TRUE@    ./$(DEPDIR)/particles-resource_manager.Po \
    9295@AMDEP_TRUE@    ./$(DEPDIR)/particles-state.Po \
    … …  
    238241                   $(MAINSRCDIR)/util/resource_manager.cc \
    239242                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
     243                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
     244                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    240245                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    241246                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    … …  
    315320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-camera.Po@am__quote@
    316321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-class_list.Po@am__quote@
     322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-element_2d.Po@am__quote@
    317323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-factory.Po@am__quote@
    318324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-framework.Po@am__quote@
    … …  
    325331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-p_node.Po@am__quote@
    326332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_fun.Po@am__quote@
     333@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-render_2d.Po@am__quote@
    327334@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-resource_manager.Po@am__quote@
    328335@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-state.Po@am__quote@
    … …  
    539546@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    540547@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-text_engine.obj `if test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/text_engine.cc'; fi`
     548
     549particles-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     550@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-render_2d.o -MD -MP -MF "$(DEPDIR)/particles-render_2d.Tpo" -c -o particles-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc; \
     551@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-render_2d.Tpo" "$(DEPDIR)/particles-render_2d.Po"; else rm -f "$(DEPDIR)/particles-render_2d.Tpo"; exit 1; fi
     552@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.o' libtool=no @AMDEPBACKSLASH@
     553@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
     554@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     555@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-render_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     556
     557particles-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
     558@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-render_2d.obj -MD -MP -MF "$(DEPDIR)/particles-render_2d.Tpo" -c -o particles-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`; \
     559@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-render_2d.Tpo" "$(DEPDIR)/particles-render_2d.Po"; else rm -f "$(DEPDIR)/particles-render_2d.Tpo"; exit 1; fi
     560@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.obj' libtool=no @AMDEPBACKSLASH@
     561@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
     562@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     563@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-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`
     564
     565particles-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     566@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-element_2d.o -MD -MP -MF "$(DEPDIR)/particles-element_2d.Tpo" -c -o particles-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc; \
     567@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-element_2d.Tpo" "$(DEPDIR)/particles-element_2d.Po"; else rm -f "$(DEPDIR)/particles-element_2d.Tpo"; exit 1; fi
     568@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.o' libtool=no @AMDEPBACKSLASH@
     569@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
     570@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     571@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-element_2d.o `test -f '$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     572
     573particles-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
     574@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-element_2d.obj -MD -MP -MF "$(DEPDIR)/particles-element_2d.Tpo" -c -o particles-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`; \
     575@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-element_2d.Tpo" "$(DEPDIR)/particles-element_2d.Po"; else rm -f "$(DEPDIR)/particles-element_2d.Tpo"; exit 1; fi
     576@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.obj' libtool=no @AMDEPBACKSLASH@
     577@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
     578@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     579@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-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`
    541580
    542581particles-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
Note: See TracChangeset for help on using the changeset viewer.