Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5348 in orxonox.OLD for trunk/src/subprojects


Ignore:
Timestamp:
Oct 10, 2005, 3:31:52 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: fixed the subProjects… again

Location:
trunk/src/subprojects
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/subprojects/Makefile.in

    r5315 r5348  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --gnu  src/subprojects/Makefile
     190          $(AUTOMAKE) --foreign  src/subprojects/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • trunk/src/subprojects/collision_detection/Makefile.am

    r5030 r5348  
    88                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
    99                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
     10                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     11                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
    1012                  $(MAINSRCDIR)/lib/event/libORXevent.a \
    1113                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
     
    2224                   collision_detection.cc \
    2325                   $(MAINSRCDIR)/util/loading/load_param.cc \
     26                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
    2427                   $(MAINSRCDIR)/lib/util/substring.cc \
    2528                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
    2629                   $(MAINSRCDIR)/world_entities/camera.cc \
    27                    $(MAINSRCDIR)/lib/graphics/light.cc \
    28                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    29                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    30                    $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
    31                    $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    3230                   $(MAINSRCDIR)/util/state.cc \
    3331                   $(MAINSRCDIR)/lib/lang/base_object.cc \
     
    3836                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    3937                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    40                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     38                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
    4139                   $(MAINSRCDIR)/world_entities/test_entity.cc \
    4240                   $(MAINSRCDIR)/world_entities/environment.cc \
  • trunk/src/subprojects/collision_detection/Makefile.in

    r5315 r5348  
    5353am_collision_OBJECTS = collision-framework.$(OBJEXT) \
    5454        collision-collision_detection.$(OBJEXT) \
    55         collision-load_param.$(OBJEXT) collision-substring.$(OBJEXT) \
    56         collision-ini_parser.$(OBJEXT) collision-camera.$(OBJEXT) \
    57         collision-light.$(OBJEXT) collision-text_engine.$(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) \
    62         collision-color.$(OBJEXT) collision-resource_manager.$(OBJEXT) \
     55        collision-load_param.$(OBJEXT) \
     56        collision-helper_functions.$(OBJEXT) \
     57        collision-substring.$(OBJEXT) collision-ini_parser.$(OBJEXT) \
     58        collision-camera.$(OBJEXT) collision-state.$(OBJEXT) \
     59        collision-base_object.$(OBJEXT) collision-class_list.$(OBJEXT) \
     60        collision-vector.$(OBJEXT) collision-color.$(OBJEXT) \
     61        collision-resource_manager.$(OBJEXT) \
    6362        collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \
    6463        collision-gui_gtk.$(OBJEXT) collision-test_entity.$(OBJEXT) \
     
    7271        $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
    7372        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
     73        $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     74        $(MAINSRCDIR)/lib/shell/libORXshell.a \
    7475        $(MAINSRCDIR)/lib/event/libORXevent.a \
    7576        $(MAINSRCDIR)/lib/sound/libORXsound.a \
     
    8889@AMDEP_TRUE@    ./$(DEPDIR)/collision-collision_detection.Po \
    8990@AMDEP_TRUE@    ./$(DEPDIR)/collision-color.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/collision-element_2d.Po \
    9191@AMDEP_TRUE@    ./$(DEPDIR)/collision-environment.Po \
    9292@AMDEP_TRUE@    ./$(DEPDIR)/collision-factory.Po \
    9393@AMDEP_TRUE@    ./$(DEPDIR)/collision-framework.Po \
    94 @AMDEP_TRUE@    ./$(DEPDIR)/collision-graphics_engine.Po \
    9594@AMDEP_TRUE@    ./$(DEPDIR)/collision-gui_gtk.Po \
     95@AMDEP_TRUE@    ./$(DEPDIR)/collision-helper_functions.Po \
    9696@AMDEP_TRUE@    ./$(DEPDIR)/collision-ini_parser.Po \
    97 @AMDEP_TRUE@    ./$(DEPDIR)/collision-light.Po \
    9897@AMDEP_TRUE@    ./$(DEPDIR)/collision-load_param.Po \
    9998@AMDEP_TRUE@    ./$(DEPDIR)/collision-null_parent.Po \
    10099@AMDEP_TRUE@    ./$(DEPDIR)/collision-p_node.Po \
    101 @AMDEP_TRUE@    ./$(DEPDIR)/collision-render_2d.Po \
    102100@AMDEP_TRUE@    ./$(DEPDIR)/collision-resource_manager.Po \
    103101@AMDEP_TRUE@    ./$(DEPDIR)/collision-state.Po \
     
    105103@AMDEP_TRUE@    ./$(DEPDIR)/collision-terrain.Po \
    106104@AMDEP_TRUE@    ./$(DEPDIR)/collision-test_entity.Po \
    107 @AMDEP_TRUE@    ./$(DEPDIR)/collision-text_engine.Po \
    108105@AMDEP_TRUE@    ./$(DEPDIR)/collision-vector.Po \
    109106@AMDEP_TRUE@    ./$(DEPDIR)/collision-world_entity.Po
     
    230227                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
    231228                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
     229                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     230                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
    232231                  $(MAINSRCDIR)/lib/event/libORXevent.a \
    233232                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
     
    242241                   collision_detection.cc \
    243242                   $(MAINSRCDIR)/util/loading/load_param.cc \
     243                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
    244244                   $(MAINSRCDIR)/lib/util/substring.cc \
    245245                   $(MAINSRCDIR)/lib/util/ini_parser.cc \
    246246                   $(MAINSRCDIR)/world_entities/camera.cc \
    247                    $(MAINSRCDIR)/lib/graphics/light.cc \
    248                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    249                    $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    250                    $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
    251                    $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    252247                   $(MAINSRCDIR)/util/state.cc \
    253248                   $(MAINSRCDIR)/lib/lang/base_object.cc \
     
    258253                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    259254                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    260                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     255                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
    261256                   $(MAINSRCDIR)/world_entities/test_entity.cc \
    262257                   $(MAINSRCDIR)/world_entities/environment.cc \
     
    281276          esac; \
    282277        done; \
    283         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/collision_detection/Makefile'; \
     278        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile'; \
    284279        cd $(top_srcdir) && \
    285           $(AUTOMAKE) --gnu  src/subprojects/collision_detection/Makefile
     280          $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile
    286281.PRECIOUS: Makefile
    287282Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     
    342337@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
    343338@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-color.Po@am__quote@
    344 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-element_2d.Po@am__quote@
    345339@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
    346340@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-factory.Po@am__quote@
    347341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-framework.Po@am__quote@
    348 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-graphics_engine.Po@am__quote@
    349342@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-gui_gtk.Po@am__quote@
     343@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-helper_functions.Po@am__quote@
    350344@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-ini_parser.Po@am__quote@
    351 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-light.Po@am__quote@
    352345@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-load_param.Po@am__quote@
    353346@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-null_parent.Po@am__quote@
    354347@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-p_node.Po@am__quote@
    355 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-render_2d.Po@am__quote@
    356348@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-resource_manager.Po@am__quote@
    357349@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-state.Po@am__quote@
     
    359351@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-terrain.Po@am__quote@
    360352@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-test_entity.Po@am__quote@
    361 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-text_engine.Po@am__quote@
    362353@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-vector.Po@am__quote@
    363354@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-world_entity.Po@am__quote@
     
    427418@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
    428419
     420collision-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
     421@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-helper_functions.o -MD -MP -MF "$(DEPDIR)/collision-helper_functions.Tpo" -c -o collision-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc; \
     422@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-helper_functions.Tpo" "$(DEPDIR)/collision-helper_functions.Po"; else rm -f "$(DEPDIR)/collision-helper_functions.Tpo"; exit 1; fi
     423@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='collision-helper_functions.o' libtool=no @AMDEPBACKSLASH@
     424@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-helper_functions.Po' tmpdepfile='$(DEPDIR)/collision-helper_functions.TPo' @AMDEPBACKSLASH@
     425@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     426@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc
     427
     428collision-helper_functions.obj: $(MAINSRCDIR)/lib/util/helper_functions.cc
     429@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-helper_functions.obj -MD -MP -MF "$(DEPDIR)/collision-helper_functions.Tpo" -c -o collision-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`; \
     430@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-helper_functions.Tpo" "$(DEPDIR)/collision-helper_functions.Po"; else rm -f "$(DEPDIR)/collision-helper_functions.Tpo"; exit 1; fi
     431@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='collision-helper_functions.obj' libtool=no @AMDEPBACKSLASH@
     432@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-helper_functions.Po' tmpdepfile='$(DEPDIR)/collision-helper_functions.TPo' @AMDEPBACKSLASH@
     433@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     434@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`
     435
    429436collision-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
    430437@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-substring.o -MD -MP -MF "$(DEPDIR)/collision-substring.Tpo" -c -o collision-substring.o `test -f '$(MAINSRCDIR)/lib/util/substring.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/substring.cc; \
     
    475482@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-camera.obj `if test -f '$(MAINSRCDIR)/world_entities/camera.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/world_entities/camera.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/world_entities/camera.cc'; fi`
    476483
    477 collision-light.o: $(MAINSRCDIR)/lib/graphics/light.cc
    478 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-light.o -MD -MP -MF "$(DEPDIR)/collision-light.Tpo" -c -o collision-light.o `test -f '$(MAINSRCDIR)/lib/graphics/light.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/light.cc; \
    479 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-light.Tpo" "$(DEPDIR)/collision-light.Po"; else rm -f "$(DEPDIR)/collision-light.Tpo"; exit 1; fi
    480 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/light.cc' object='collision-light.o' libtool=no @AMDEPBACKSLASH@
    481 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-light.Po' tmpdepfile='$(DEPDIR)/collision-light.TPo' @AMDEPBACKSLASH@
    482 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    483 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-light.o `test -f '$(MAINSRCDIR)/lib/graphics/light.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/light.cc
    484 
    485 collision-light.obj: $(MAINSRCDIR)/lib/graphics/light.cc
    486 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-light.obj -MD -MP -MF "$(DEPDIR)/collision-light.Tpo" -c -o collision-light.obj `if test -f '$(MAINSRCDIR)/lib/graphics/light.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/light.cc'; fi`; \
    487 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-light.Tpo" "$(DEPDIR)/collision-light.Po"; else rm -f "$(DEPDIR)/collision-light.Tpo"; exit 1; fi
    488 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/light.cc' object='collision-light.obj' libtool=no @AMDEPBACKSLASH@
    489 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-light.Po' tmpdepfile='$(DEPDIR)/collision-light.TPo' @AMDEPBACKSLASH@
    490 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    491 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-light.obj `if test -f '$(MAINSRCDIR)/lib/graphics/light.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/graphics/light.cc'; fi`
    492 
    493 collision-text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    494 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-text_engine.o -MD -MP -MF "$(DEPDIR)/collision-text_engine.Tpo" -c -o collision-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
    495 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-text_engine.Tpo" "$(DEPDIR)/collision-text_engine.Po"; else rm -f "$(DEPDIR)/collision-text_engine.Tpo"; exit 1; fi
    496 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='collision-text_engine.o' libtool=no @AMDEPBACKSLASH@
    497 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-text_engine.Po' tmpdepfile='$(DEPDIR)/collision-text_engine.TPo' @AMDEPBACKSLASH@
    498 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    499 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
    500 
    501 collision-text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    502 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-text_engine.obj -MD -MP -MF "$(DEPDIR)/collision-text_engine.Tpo" -c -o collision-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`; \
    503 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-text_engine.Tpo" "$(DEPDIR)/collision-text_engine.Po"; else rm -f "$(DEPDIR)/collision-text_engine.Tpo"; exit 1; fi
    504 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='collision-text_engine.obj' libtool=no @AMDEPBACKSLASH@
    505 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-text_engine.Po' tmpdepfile='$(DEPDIR)/collision-text_engine.TPo' @AMDEPBACKSLASH@
    506 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    507 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-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`
    508 
    509 collision-graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
    510 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-graphics_engine.o -MD -MP -MF "$(DEPDIR)/collision-graphics_engine.Tpo" -c -o collision-graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc; \
    511 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-graphics_engine.Tpo" "$(DEPDIR)/collision-graphics_engine.Po"; else rm -f "$(DEPDIR)/collision-graphics_engine.Tpo"; exit 1; fi
    512 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='collision-graphics_engine.o' libtool=no @AMDEPBACKSLASH@
    513 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-graphics_engine.Po' tmpdepfile='$(DEPDIR)/collision-graphics_engine.TPo' @AMDEPBACKSLASH@
    514 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    515 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc
    516 
    517 collision-graphics_engine.obj: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
    518 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-graphics_engine.obj -MD -MP -MF "$(DEPDIR)/collision-graphics_engine.Tpo" -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`; \
    519 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-graphics_engine.Tpo" "$(DEPDIR)/collision-graphics_engine.Po"; else rm -f "$(DEPDIR)/collision-graphics_engine.Tpo"; exit 1; fi
    520 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' object='collision-graphics_engine.obj' libtool=no @AMDEPBACKSLASH@
    521 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-graphics_engine.Po' tmpdepfile='$(DEPDIR)/collision-graphics_engine.TPo' @AMDEPBACKSLASH@
    522 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    523 @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`
    524 
    525 collision-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
    526 @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; \
    527 @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
    528 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.o' libtool=no @AMDEPBACKSLASH@
    529 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
    530 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    531 @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
    532 
    533 collision-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
    534 @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`; \
    535 @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
    536 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='collision-render_2d.obj' libtool=no @AMDEPBACKSLASH@
    537 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-render_2d.Po' tmpdepfile='$(DEPDIR)/collision-render_2d.TPo' @AMDEPBACKSLASH@
    538 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    539 @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`
    540 
    541 collision-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
    542 @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; \
    543 @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
    544 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.o' libtool=no @AMDEPBACKSLASH@
    545 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
    546 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    547 @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
    548 
    549 collision-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
    550 @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`; \
    551 @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
    552 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='collision-element_2d.obj' libtool=no @AMDEPBACKSLASH@
    553 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-element_2d.Po' tmpdepfile='$(DEPDIR)/collision-element_2d.TPo' @AMDEPBACKSLASH@
    554 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    555 @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`
    556 
    557484collision-state.o: $(MAINSRCDIR)/util/state.cc
    558485@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; \
     
    683610@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
    684611
    685 collision-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
    686 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.o -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc; \
     612collision-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
     613@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.o -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc; \
    687614@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-gui_gtk.Tpo" "$(DEPDIR)/collision-gui_gtk.Po"; else rm -f "$(DEPDIR)/collision-gui_gtk.Tpo"; exit 1; fi
    688 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='collision-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
     615@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='collision-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
    689616@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-gui_gtk.Po' tmpdepfile='$(DEPDIR)/collision-gui_gtk.TPo' @AMDEPBACKSLASH@
    690617@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    691 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc
    692 
    693 collision-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
    694 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`; \
     618@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
     619
     620collision-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
     621@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/collision-gui_gtk.Tpo" -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`; \
    695622@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-gui_gtk.Tpo" "$(DEPDIR)/collision-gui_gtk.Po"; else rm -f "$(DEPDIR)/collision-gui_gtk.Tpo"; exit 1; fi
    696 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='collision-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
     623@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='collision-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
    697624@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-gui_gtk.Po' tmpdepfile='$(DEPDIR)/collision-gui_gtk.TPo' @AMDEPBACKSLASH@
    698625@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    699 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`
     626@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`
    700627
    701628collision-test_entity.o: $(MAINSRCDIR)/world_entities/test_entity.cc
  • trunk/src/subprojects/importer/Makefile.am

    r5031 r5348  
    1010importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
    1111                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     12                 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     13                 $(MAINSRCDIR)/lib/shell/libORXshell.a \
    1214                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
    1315                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
     
    1517importer_SOURCES= ../framework.cc \
    1618                  importer.cc \
    17                   $(MAINSRCDIR)/lib/graphics/light.cc \
    1819                  $(MAINSRCDIR)/util/state.cc \
    1920                  $(MAINSRCDIR)/world_entities/camera.cc \
    20                   $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
    2121                  $(MAINSRCDIR)/lib/lang/base_object.cc \
    2222                  $(MAINSRCDIR)/lib/lang/class_list.cc \
     
    2424                  $(MAINSRCDIR)/util/resource_manager.cc \
    2525                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
    26                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    27                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
    28                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    2926                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    3027                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
    3128                  $(MAINSRCDIR)/util/loading/load_param.cc \
     29                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
    3230                  $(MAINSRCDIR)/lib/util/substring.cc \
    3331                  $(MAINSRCDIR)/lib/util/color.cc \
  • trunk/src/subprojects/importer/Makefile.in

    r5315 r5348  
    5757        importer-base_object.$(OBJEXT) importer-class_list.$(OBJEXT) \
    5858        importer-vector.$(OBJEXT) importer-resource_manager.$(OBJEXT) \
    59         importer-ini_parser.$(OBJEXT) importer-text_engine.$(OBJEXT) \
    60         importer-render_2d.$(OBJEXT) importer-element_2d.$(OBJEXT) \
    61         importer-p_node.$(OBJEXT) importer-null_parent.$(OBJEXT) \
    62         importer-load_param.$(OBJEXT) importer-substring.$(OBJEXT) \
    63         importer-color.$(OBJEXT) importer-factory.$(OBJEXT)
     59        importer-ini_parser.$(OBJEXT) importer-p_node.$(OBJEXT) \
     60        importer-null_parent.$(OBJEXT) importer-load_param.$(OBJEXT) \
     61        importer-helper_functions.$(OBJEXT) \
     62        importer-substring.$(OBJEXT) importer-color.$(OBJEXT) \
     63        importer-factory.$(OBJEXT)
    6464importer_OBJECTS = $(am_importer_OBJECTS)
    6565importer_DEPENDENCIES = $(MAINSRCDIR)/lib/event/libORXevent.a \
    6666        $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     67        $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     68        $(MAINSRCDIR)/lib/shell/libORXshell.a \
    6769        $(MAINSRCDIR)/lib/sound/libORXsound.a \
    6870        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
     
    7476@AMDEP_TRUE@    ./$(DEPDIR)/importer-class_list.Po \
    7577@AMDEP_TRUE@    ./$(DEPDIR)/importer-color.Po \
    76 @AMDEP_TRUE@    ./$(DEPDIR)/importer-element_2d.Po \
    7778@AMDEP_TRUE@    ./$(DEPDIR)/importer-factory.Po \
    7879@AMDEP_TRUE@    ./$(DEPDIR)/importer-framework.Po \
    7980@AMDEP_TRUE@    ./$(DEPDIR)/importer-graphics_engine.Po \
     81@AMDEP_TRUE@    ./$(DEPDIR)/importer-helper_functions.Po \
    8082@AMDEP_TRUE@    ./$(DEPDIR)/importer-importer.Po \
    8183@AMDEP_TRUE@    ./$(DEPDIR)/importer-ini_parser.Po \
     
    8486@AMDEP_TRUE@    ./$(DEPDIR)/importer-null_parent.Po \
    8587@AMDEP_TRUE@    ./$(DEPDIR)/importer-p_node.Po \
    86 @AMDEP_TRUE@    ./$(DEPDIR)/importer-render_2d.Po \
    8788@AMDEP_TRUE@    ./$(DEPDIR)/importer-resource_manager.Po \
    8889@AMDEP_TRUE@    ./$(DEPDIR)/importer-state.Po \
    8990@AMDEP_TRUE@    ./$(DEPDIR)/importer-substring.Po \
    90 @AMDEP_TRUE@    ./$(DEPDIR)/importer-text_engine.Po \
    9191@AMDEP_TRUE@    ./$(DEPDIR)/importer-vector.Po
    9292CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     
    213213importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
    214214                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
     215                 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     216                 $(MAINSRCDIR)/lib/shell/libORXshell.a \
    215217                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
    216218                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
     
    227229                  $(MAINSRCDIR)/util/resource_manager.cc \
    228230                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
    229                   $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    230                   $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
    231                   $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    232231                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    233232                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
    234233                  $(MAINSRCDIR)/util/loading/load_param.cc \
     234                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
    235235                  $(MAINSRCDIR)/lib/util/substring.cc \
    236236                  $(MAINSRCDIR)/lib/util/color.cc \
     
    250250          esac; \
    251251        done; \
    252         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
     252        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
    253253        cd $(top_srcdir) && \
    254           $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
     254          $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
    255255.PRECIOUS: Makefile
    256256Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     
    307307@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-class_list.Po@am__quote@
    308308@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-color.Po@am__quote@
    309 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-element_2d.Po@am__quote@
    310309@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-factory.Po@am__quote@
    311310@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-framework.Po@am__quote@
    312311@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-graphics_engine.Po@am__quote@
     312@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-helper_functions.Po@am__quote@
    313313@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-importer.Po@am__quote@
    314314@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-ini_parser.Po@am__quote@
     
    317317@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-null_parent.Po@am__quote@
    318318@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-p_node.Po@am__quote@
    319 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-render_2d.Po@am__quote@
    320319@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-resource_manager.Po@am__quote@
    321320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-state.Po@am__quote@
    322321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-substring.Po@am__quote@
    323 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-text_engine.Po@am__quote@
    324322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/importer-vector.Po@am__quote@
    325323
     
    516514@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`
    517515
    518 importer-text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    519 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-text_engine.o -MD -MP -MF "$(DEPDIR)/importer-text_engine.Tpo" -c -o importer-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
    520 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-text_engine.Tpo" "$(DEPDIR)/importer-text_engine.Po"; else rm -f "$(DEPDIR)/importer-text_engine.Tpo"; exit 1; fi
    521 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='importer-text_engine.o' libtool=no @AMDEPBACKSLASH@
    522 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-text_engine.Po' tmpdepfile='$(DEPDIR)/importer-text_engine.TPo' @AMDEPBACKSLASH@
    523 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    524 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
    525 
    526 importer-text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    527 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-text_engine.obj -MD -MP -MF "$(DEPDIR)/importer-text_engine.Tpo" -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`; \
    528 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-text_engine.Tpo" "$(DEPDIR)/importer-text_engine.Po"; else rm -f "$(DEPDIR)/importer-text_engine.Tpo"; exit 1; fi
    529 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='importer-text_engine.obj' libtool=no @AMDEPBACKSLASH@
    530 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-text_engine.Po' tmpdepfile='$(DEPDIR)/importer-text_engine.TPo' @AMDEPBACKSLASH@
    531 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    532 @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`
    533 
    534 importer-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
    535 @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; \
    536 @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
    537 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.o' libtool=no @AMDEPBACKSLASH@
    538 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
    539 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    540 @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
    541 
    542 importer-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
    543 @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`; \
    544 @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
    545 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='importer-render_2d.obj' libtool=no @AMDEPBACKSLASH@
    546 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-render_2d.Po' tmpdepfile='$(DEPDIR)/importer-render_2d.TPo' @AMDEPBACKSLASH@
    547 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    548 @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`
    549 
    550 importer-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
    551 @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; \
    552 @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
    553 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.o' libtool=no @AMDEPBACKSLASH@
    554 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
    555 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    556 @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
    557 
    558 importer-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
    559 @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`; \
    560 @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
    561 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='importer-element_2d.obj' libtool=no @AMDEPBACKSLASH@
    562 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-element_2d.Po' tmpdepfile='$(DEPDIR)/importer-element_2d.TPo' @AMDEPBACKSLASH@
    563 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    564 @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`
    565 
    566516importer-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
    567517@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-p_node.o -MD -MP -MF "$(DEPDIR)/importer-p_node.Tpo" -c -o importer-p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc; \
     
    611561@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    612562@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
     563
     564importer-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
     565@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-helper_functions.o -MD -MP -MF "$(DEPDIR)/importer-helper_functions.Tpo" -c -o importer-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc; \
     566@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-helper_functions.Tpo" "$(DEPDIR)/importer-helper_functions.Po"; else rm -f "$(DEPDIR)/importer-helper_functions.Tpo"; exit 1; fi
     567@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='importer-helper_functions.o' libtool=no @AMDEPBACKSLASH@
     568@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-helper_functions.Po' tmpdepfile='$(DEPDIR)/importer-helper_functions.TPo' @AMDEPBACKSLASH@
     569@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     570@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc
     571
     572importer-helper_functions.obj: $(MAINSRCDIR)/lib/util/helper_functions.cc
     573@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT importer-helper_functions.obj -MD -MP -MF "$(DEPDIR)/importer-helper_functions.Tpo" -c -o importer-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`; \
     574@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/importer-helper_functions.Tpo" "$(DEPDIR)/importer-helper_functions.Po"; else rm -f "$(DEPDIR)/importer-helper_functions.Tpo"; exit 1; fi
     575@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='importer-helper_functions.obj' libtool=no @AMDEPBACKSLASH@
     576@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/importer-helper_functions.Po' tmpdepfile='$(DEPDIR)/importer-helper_functions.TPo' @AMDEPBACKSLASH@
     577@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     578@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(importer_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o importer-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`
    613579
    614580importer-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
  • trunk/src/subprojects/particles/Makefile.am

    r5031 r5348  
    88                  $(MAINSRCDIR)/lib/event/libORXevent.a \
    99                  $(MAINSRCDIR)/lib/particles/libORXparticles.a \
     10                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
    1011                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
     12                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
    1113                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
    1214                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
     
    2830                   $(MAINSRCDIR)/lib/math/vector.cc \
    2931                   $(MAINSRCDIR)/util/resource_manager.cc \
    30                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    31                    $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
    32                    $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    3332                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    3433                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    35                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     34                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
    3635                   $(MAINSRCDIR)/lib/util/substring.cc \
    3736                   $(MAINSRCDIR)/util/loading/load_param.cc \
     37                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
    3838                   $(MAINSRCDIR)/util/loading/factory.cc \
    3939                   $(MAINSRCDIR)/lib/util/color.cc \
  • trunk/src/subprojects/particles/Makefile.in

    r5315 r5348  
    5959        particles-vector.$(OBJEXT) \
    6060        particles-resource_manager.$(OBJEXT) \
    61         particles-text_engine.$(OBJEXT) particles-render_2d.$(OBJEXT) \
    62         particles-element_2d.$(OBJEXT) particles-p_node.$(OBJEXT) \
    63         particles-null_parent.$(OBJEXT) particles-gui_gtk.$(OBJEXT) \
    64         particles-substring.$(OBJEXT) particles-load_param.$(OBJEXT) \
     61        particles-p_node.$(OBJEXT) particles-null_parent.$(OBJEXT) \
     62        particles-gui_gtk.$(OBJEXT) particles-substring.$(OBJEXT) \
     63        particles-load_param.$(OBJEXT) \
     64        particles-helper_functions.$(OBJEXT) \
    6565        particles-factory.$(OBJEXT) particles-color.$(OBJEXT) \
    6666        particles-ini_parser.$(OBJEXT)
     
    7070        $(MAINSRCDIR)/lib/event/libORXevent.a \
    7171        $(MAINSRCDIR)/lib/particles/libORXparticles.a \
     72        $(MAINSRCDIR)/lib/shell/libORXshell.a \
    7273        $(MAINSRCDIR)/lib/sound/libORXsound.a \
     74        $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
    7375        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
    7476        $(MAINSRCDIR)/lib/physics/libORXphysics.a \
     
    8284@AMDEP_TRUE@    ./$(DEPDIR)/particles-class_list.Po \
    8385@AMDEP_TRUE@    ./$(DEPDIR)/particles-color.Po \
    84 @AMDEP_TRUE@    ./$(DEPDIR)/particles-element_2d.Po \
    8586@AMDEP_TRUE@    ./$(DEPDIR)/particles-factory.Po \
    8687@AMDEP_TRUE@    ./$(DEPDIR)/particles-framework.Po \
    8788@AMDEP_TRUE@    ./$(DEPDIR)/particles-graphics_engine.Po \
    8889@AMDEP_TRUE@    ./$(DEPDIR)/particles-gui_gtk.Po \
     90@AMDEP_TRUE@    ./$(DEPDIR)/particles-helper_functions.Po \
    8991@AMDEP_TRUE@    ./$(DEPDIR)/particles-ini_parser.Po \
    9092@AMDEP_TRUE@    ./$(DEPDIR)/particles-light.Po \
     
    9395@AMDEP_TRUE@    ./$(DEPDIR)/particles-p_node.Po \
    9496@AMDEP_TRUE@    ./$(DEPDIR)/particles-particle_fun.Po \
    95 @AMDEP_TRUE@    ./$(DEPDIR)/particles-render_2d.Po \
    9697@AMDEP_TRUE@    ./$(DEPDIR)/particles-resource_manager.Po \
    9798@AMDEP_TRUE@    ./$(DEPDIR)/particles-state.Po \
    9899@AMDEP_TRUE@    ./$(DEPDIR)/particles-substring.Po \
    99 @AMDEP_TRUE@    ./$(DEPDIR)/particles-text_engine.Po \
    100100@AMDEP_TRUE@    ./$(DEPDIR)/particles-vector.Po \
    101101@AMDEP_TRUE@    ./$(DEPDIR)/particles-world_entity.Po
     
    222222                  $(MAINSRCDIR)/lib/event/libORXevent.a \
    223223                  $(MAINSRCDIR)/lib/particles/libORXparticles.a \
     224                  $(MAINSRCDIR)/lib/shell/libORXshell.a \
    224225                  $(MAINSRCDIR)/lib/sound/libORXsound.a \
     226                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
    225227                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
    226228                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
     
    242244                   $(MAINSRCDIR)/lib/math/vector.cc \
    243245                   $(MAINSRCDIR)/util/resource_manager.cc \
    244                    $(MAINSRCDIR)/lib/graphics/text_engine.cc \
    245                    $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc \
    246                    $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc \
    247246                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    248247                   $(MAINSRCDIR)/lib/coord/null_parent.cc \
    249                    $(MAINSRCDIR)/lib/gui/gui_gtk.cc \
     248                   $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc \
    250249                   $(MAINSRCDIR)/lib/util/substring.cc \
    251250                   $(MAINSRCDIR)/util/loading/load_param.cc \
     251                   $(MAINSRCDIR)/lib/util/helper_functions.cc \
    252252                   $(MAINSRCDIR)/util/loading/factory.cc \
    253253                   $(MAINSRCDIR)/lib/util/color.cc \
     
    267267          esac; \
    268268        done; \
    269         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
     269        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
    270270        cd $(top_srcdir) && \
    271           $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
     271          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
    272272.PRECIOUS: Makefile
    273273Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
     
    324324@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-class_list.Po@am__quote@
    325325@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-color.Po@am__quote@
    326 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-element_2d.Po@am__quote@
    327326@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-factory.Po@am__quote@
    328327@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-framework.Po@am__quote@
    329328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-graphics_engine.Po@am__quote@
    330329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-gui_gtk.Po@am__quote@
     330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-helper_functions.Po@am__quote@
    331331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-ini_parser.Po@am__quote@
    332332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-light.Po@am__quote@
     
    335335@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-p_node.Po@am__quote@
    336336@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-particle_fun.Po@am__quote@
    337 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-render_2d.Po@am__quote@
    338337@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-resource_manager.Po@am__quote@
    339338@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-state.Po@am__quote@
    340339@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-substring.Po@am__quote@
    341 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-text_engine.Po@am__quote@
    342340@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-vector.Po@am__quote@
    343341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particles-world_entity.Po@am__quote@
     
    535533@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-resource_manager.obj `if test -f '$(MAINSRCDIR)/util/resource_manager.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/resource_manager.cc'; fi`
    536534
    537 particles-text_engine.o: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    538 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-text_engine.o -MD -MP -MF "$(DEPDIR)/particles-text_engine.Tpo" -c -o particles-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc; \
    539 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-text_engine.Tpo" "$(DEPDIR)/particles-text_engine.Po"; else rm -f "$(DEPDIR)/particles-text_engine.Tpo"; exit 1; fi
    540 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='particles-text_engine.o' libtool=no @AMDEPBACKSLASH@
    541 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-text_engine.Po' tmpdepfile='$(DEPDIR)/particles-text_engine.TPo' @AMDEPBACKSLASH@
    542 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    543 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-text_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/text_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/text_engine.cc
    544 
    545 particles-text_engine.obj: $(MAINSRCDIR)/lib/graphics/text_engine.cc
    546 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-text_engine.obj -MD -MP -MF "$(DEPDIR)/particles-text_engine.Tpo" -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`; \
    547 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-text_engine.Tpo" "$(DEPDIR)/particles-text_engine.Po"; else rm -f "$(DEPDIR)/particles-text_engine.Tpo"; exit 1; fi
    548 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/text_engine.cc' object='particles-text_engine.obj' libtool=no @AMDEPBACKSLASH@
    549 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-text_engine.Po' tmpdepfile='$(DEPDIR)/particles-text_engine.TPo' @AMDEPBACKSLASH@
    550 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    551 @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`
    552 
    553 particles-render_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
    554 @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; \
    555 @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
    556 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.o' libtool=no @AMDEPBACKSLASH@
    557 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
    558 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    559 @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
    560 
    561 particles-render_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc
    562 @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`; \
    563 @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
    564 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/render_2d.cc' object='particles-render_2d.obj' libtool=no @AMDEPBACKSLASH@
    565 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-render_2d.Po' tmpdepfile='$(DEPDIR)/particles-render_2d.TPo' @AMDEPBACKSLASH@
    566 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    567 @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`
    568 
    569 particles-element_2d.o: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
    570 @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; \
    571 @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
    572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.o' libtool=no @AMDEPBACKSLASH@
    573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
    574 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    575 @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
    576 
    577 particles-element_2d.obj: $(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc
    578 @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`; \
    579 @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
    580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/graphics/render2D/element_2d.cc' object='particles-element_2d.obj' libtool=no @AMDEPBACKSLASH@
    581 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-element_2d.Po' tmpdepfile='$(DEPDIR)/particles-element_2d.TPo' @AMDEPBACKSLASH@
    582 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    583 @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`
    584 
    585535particles-p_node.o: $(MAINSRCDIR)/lib/coord/p_node.cc
    586536@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-p_node.o -MD -MP -MF "$(DEPDIR)/particles-p_node.Tpo" -c -o particles-p_node.o `test -f '$(MAINSRCDIR)/lib/coord/p_node.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/coord/p_node.cc; \
     
    615565@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-null_parent.obj `if test -f '$(MAINSRCDIR)/lib/coord/null_parent.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/coord/null_parent.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/coord/null_parent.cc'; fi`
    616566
    617 particles-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
    618 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.o -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc; \
     567particles-gui_gtk.o: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
     568@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.o -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc; \
    619569@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-gui_gtk.Tpo" "$(DEPDIR)/particles-gui_gtk.Po"; else rm -f "$(DEPDIR)/particles-gui_gtk.Tpo"; exit 1; fi
    620 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='particles-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
     570@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='particles-gui_gtk.o' libtool=no @AMDEPBACKSLASH@
    621571@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-gui_gtk.Po' tmpdepfile='$(DEPDIR)/particles-gui_gtk.TPo' @AMDEPBACKSLASH@
    622572@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    623 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gui_gtk.cc
    624 
    625 particles-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gui_gtk.cc
    626 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`; \
     573@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.o `test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
     574
     575particles-gui_gtk.obj: $(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc
     576@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-gui_gtk.obj -MD -MP -MF "$(DEPDIR)/particles-gui_gtk.Tpo" -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`; \
    627577@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-gui_gtk.Tpo" "$(DEPDIR)/particles-gui_gtk.Po"; else rm -f "$(DEPDIR)/particles-gui_gtk.Tpo"; exit 1; fi
    628 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gui_gtk.cc' object='particles-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
     578@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc' object='particles-gui_gtk.obj' libtool=no @AMDEPBACKSLASH@
    629579@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-gui_gtk.Po' tmpdepfile='$(DEPDIR)/particles-gui_gtk.TPo' @AMDEPBACKSLASH@
    630580@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    631 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gui_gtk.cc'; fi`
     581@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-gui_gtk.obj `if test -f '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/gui/gtk_gui/gui_gtk.cc'; fi`
    632582
    633583particles-substring.o: $(MAINSRCDIR)/lib/util/substring.cc
     
    662612@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    663613@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-load_param.obj `if test -f '$(MAINSRCDIR)/util/loading/load_param.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/util/loading/load_param.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/util/loading/load_param.cc'; fi`
     614
     615particles-helper_functions.o: $(MAINSRCDIR)/lib/util/helper_functions.cc
     616@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-helper_functions.o -MD -MP -MF "$(DEPDIR)/particles-helper_functions.Tpo" -c -o particles-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc; \
     617@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-helper_functions.Tpo" "$(DEPDIR)/particles-helper_functions.Po"; else rm -f "$(DEPDIR)/particles-helper_functions.Tpo"; exit 1; fi
     618@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='particles-helper_functions.o' libtool=no @AMDEPBACKSLASH@
     619@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-helper_functions.Po' tmpdepfile='$(DEPDIR)/particles-helper_functions.TPo' @AMDEPBACKSLASH@
     620@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     621@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-helper_functions.o `test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/helper_functions.cc
     622
     623particles-helper_functions.obj: $(MAINSRCDIR)/lib/util/helper_functions.cc
     624@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particles-helper_functions.obj -MD -MP -MF "$(DEPDIR)/particles-helper_functions.Tpo" -c -o particles-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`; \
     625@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particles-helper_functions.Tpo" "$(DEPDIR)/particles-helper_functions.Po"; else rm -f "$(DEPDIR)/particles-helper_functions.Tpo"; exit 1; fi
     626@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/helper_functions.cc' object='particles-helper_functions.obj' libtool=no @AMDEPBACKSLASH@
     627@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particles-helper_functions.Po' tmpdepfile='$(DEPDIR)/particles-helper_functions.TPo' @AMDEPBACKSLASH@
     628@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     629@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-helper_functions.obj `if test -f '$(MAINSRCDIR)/lib/util/helper_functions.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/helper_functions.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/helper_functions.cc'; fi`
    664630
    665631particles-factory.o: $(MAINSRCDIR)/util/loading/factory.cc
  • trunk/src/subprojects/particles/particle_fun.cc

    r4741 r5348  
    2424#include "graphics_engine.h"
    2525#include "light.h"
     26#include "resource_manager.h"
    2627
    2728#include <dirent.h>
  • trunk/src/subprojects/testmain/Makefile.in

    r5315 r5348  
    196196          esac; \
    197197        done; \
    198         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
     198        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
    199199        cd $(top_srcdir) && \
    200           $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
     200          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
    201201.PRECIOUS: Makefile
    202202Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.