Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5479 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Nov 3, 2005, 8:50:51 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: updated to new autoconf, moved resourcemanager to util/loading

Location:
trunk/src
Files:
24 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(orxonox_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXlibs_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/collision_detection/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXcd_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/event/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXevent_a_SOURCES)
    1917
    2018srcdir = @srcdir@

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

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXgraphics_a_SOURCES)
    1917
    2018srcdir = @srcdir@

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

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXimporter_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXquadtree_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/gui/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33

  • trunk/src/lib/gui/gl_gui/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXglgui_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/gui/gtk_gui/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXgui_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/particles/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXparticles_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/physics/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXphysics_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/shell/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXshell_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/sound/Makefile.in

    r5473 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXsound_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/lib/tinyxml/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libtinyxml_a_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/orxonox.cc

    r5424 r5479  
    285285              CONFIG_SECTION_DATA,
    286286              CONFIG_NAME_DATADIR);
     287    Gui* gui = new Gui(argc, argv);
     288    gui->startGui();
     289    delete gui;
    287290    exit(-1);
    288291  }

  • trunk/src/subprojects/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33

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

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 SOURCES = $(collision_SOURCES)
    1816
    1917srcdir = @srcdir@

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

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 SOURCES = $(importer_SOURCES)
    1816
    1917srcdir = @srcdir@

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

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1414
    1515@SET_MAKE@
    16 
    17 SOURCES = $(particles_SOURCES)
    1816
    1917srcdir = @srcdir@

  • trunk/src/subprojects/testmain/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(testmain_SOURCES)
    1917
    2018srcdir = @srcdir@

  • trunk/src/util/Makefile.am

    r5463 r5479  
    66libORXutils_a_SOURCES = fast_factory.cc \
    77                        garbage_collector.cc \
    8                         resource_manager.cc \
    98                        state.cc \
    109                        user_control.cc \
    … …  
    1211                        animation/animation.cc \
    1312                        animation/animation_player.cc \
     13                        loading/resource_manager.cc \
    1414                        loading/factory.cc \
    1515                        loading/game_loader.cc \
    … …  
    2121noinst_HEADERS =        fast_factory.h \
    2222                        garbage_collector.h \
    23                         resource_manager.h \
    2423                        state.h \
    2524                        user_control.h \
    … …  
    2827                        animation/animation_player.h \
    2928                        animation/t_animation.h \
     29                        loading/resource_manager.h \
    3030                        loading/factory.h \
    3131                        loading/game_loader.h \

  • trunk/src/util/Makefile.in

    r5475 r5479  
    1 # Makefile.in generated by automake 1.9.5 from Makefile.am.
     1# Makefile.in generated by automake 1.9.6 from Makefile.am.
    22# @configure_input@
    33
    … …  
    1515@SET_MAKE@
    1616
    17 
    18 SOURCES = $(libORXutils_a_SOURCES)
    1917
    2018srcdir = @srcdir@
    … …  
    5755libORXutils_a_LIBADD =
    5856am_libORXutils_a_OBJECTS = fast_factory.$(OBJEXT) \
    59         garbage_collector.$(OBJEXT) resource_manager.$(OBJEXT) \
    60         state.$(OBJEXT) user_control.$(OBJEXT) animation3d.$(OBJEXT) \
     57        garbage_collector.$(OBJEXT) state.$(OBJEXT) \
     58        user_control.$(OBJEXT) animation3d.$(OBJEXT) \
    6159        animation.$(OBJEXT) animation_player.$(OBJEXT) \
    62         factory.$(OBJEXT) game_loader.$(OBJEXT) load_param.$(OBJEXT) \
     60        resource_manager.$(OBJEXT) factory.$(OBJEXT) \
     61        game_loader.$(OBJEXT) load_param.$(OBJEXT) \
    6362        pilot_node.$(OBJEXT) track_manager.$(OBJEXT) \
    6463        track_node.$(OBJEXT)
    … …  
    192191libORXutils_a_SOURCES = fast_factory.cc \
    193192                        garbage_collector.cc \
    194                         resource_manager.cc \
    195193                        state.cc \
    196194                        user_control.cc \
    … …  
    198196                        animation/animation.cc \
    199197                        animation/animation_player.cc \
     198                        loading/resource_manager.cc \
    200199                        loading/factory.cc \
    201200                        loading/game_loader.cc \
    … …  
    207206noinst_HEADERS = fast_factory.h \
    208207                        garbage_collector.h \
    209                         resource_manager.h \
    210208                        state.h \
    211209                        user_control.h \
    … …  
    214212                        animation/animation_player.h \
    215213                        animation/t_animation.h \
     214                        loading/resource_manager.h \
    216215                        loading/factory.h \
    217216                        loading/game_loader.h \
    … …  
    338337@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    339338@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o animation_player.obj `if test -f 'animation/animation_player.cc'; then $(CYGPATH_W) 'animation/animation_player.cc'; else $(CYGPATH_W) '$(srcdir)/animation/animation_player.cc'; fi`
     339
     340resource_manager.o: loading/resource_manager.cc
     341@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.o -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.o `test -f 'loading/resource_manager.cc' || echo '$(srcdir)/'`loading/resource_manager.cc; \
     342@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     343@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='loading/resource_manager.cc' object='resource_manager.o' libtool=no @AMDEPBACKSLASH@
     344@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     345@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.o `test -f 'loading/resource_manager.cc' || echo '$(srcdir)/'`loading/resource_manager.cc
     346
     347resource_manager.obj: loading/resource_manager.cc
     348@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT resource_manager.obj -MD -MP -MF "$(DEPDIR)/resource_manager.Tpo" -c -o resource_manager.obj `if test -f 'loading/resource_manager.cc'; then $(CYGPATH_W) 'loading/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/loading/resource_manager.cc'; fi`; \
     349@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/resource_manager.Tpo" "$(DEPDIR)/resource_manager.Po"; else rm -f "$(DEPDIR)/resource_manager.Tpo"; exit 1; fi
     350@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='loading/resource_manager.cc' object='resource_manager.obj' libtool=no @AMDEPBACKSLASH@
     351@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     352@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o resource_manager.obj `if test -f 'loading/resource_manager.cc'; then $(CYGPATH_W) 'loading/resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/loading/resource_manager.cc'; fi`
    340353
    341354factory.o: loading/factory.cc

  • trunk/src/world_entities/weapons/rocket.cc

    r5472 r5479  
    115115  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::trailParticles);
    116116
     117  this->update(0);
    117118  this->emitter->setEmissionRate(45.0);
    118119  this->emitter->setEmissionVelocity(0.0);
Note: See TracChangeset for help on using the changeset viewer.