Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4506 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 4, 2005, 12:49:24 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: building the SoundEngine as a lib

Location:
orxonox/trunk
Files:
20 edited
2 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/configure

    r4504 r4506  
    87328732## OUTPUT CONFIGURE ##
    87338733######################
    8734                                                                                                                                                       ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
     8734                                                                                                                                                                ac_config_files="$ac_config_files Makefile src/Makefile src/lib/Makefile src/lib/graphics/Makefile src/lib/graphics/importer/Makefile src/lib/sound/Makefile src/lib/event/Makefile src/lib/physics/Makefile src/lib/particles/Makefile src/lib/gui/Makefile src/lib/tinyxml/Makefile src/subprojects/Makefile src/subprojects/testmain/Makefile src/subprojects/importer/Makefile src/subprojects/particles/Makefile src/subprojects/gui/Makefile"
    87358735
    87368736
    … …  
    93319331  "src/lib/graphics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/Makefile" ;;
    93329332  "src/lib/graphics/importer/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/graphics/importer/Makefile" ;;
     9333  "src/lib/sound/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/sound/Makefile" ;;
    93339334  "src/lib/event/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/event/Makefile" ;;
    93349335  "src/lib/physics/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/physics/Makefile" ;;

  • orxonox/trunk/configure.ac

    r4504 r4506  
    589589                 src/lib/graphics/Makefile
    590590                 src/lib/graphics/importer/Makefile
     591                 src/lib/sound/Makefile
    591592                 src/lib/event/Makefile
    592593                 src/lib/physics/Makefile

  • orxonox/trunk/src/Makefile.am

    r4504 r4506  
    99
    1010orxonox_DEPENDENCIES = lib/gui/libORXgui.a \
     11                       lib/sound/libORXsound.a \
    1112                       lib/event/libORXevent.a \
    1213                       lib/physics/libORXphysics.a \
    … …  
    1516
    1617orxonox_LDADD = lib/gui/libORXgui.a \
     18                lib/sound/libORXsound.a \
    1719                lib/event/libORXevent.a \
    1820                lib/physics/libORXphysics.a \
    … …  
    6668                 lib/graphics/importer/material.cc \
    6769                 lib/graphics/importer/texture.cc \
    68                  lib/sound/sound_engine.cc \
    6970                 lib/lang/base_object.cc \
    7071                 lib/util/ini_parser.cc \
    … …  
    138139                 lib/graphics/importer/material.h \
    139140                 lib/graphics/importer/texture.h \
    140                  lib/sound/sound_engine.h \
    141141                 lib/lang/base_object.h \
    142142                 lib/util/ini_parser.h \

  • orxonox/trunk/src/Makefile.in

    r4504 r4506  
    6969        text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    7070        md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
    71         material.$(OBJEXT) texture.$(OBJEXT) sound_engine.$(OBJEXT) \
    72         base_object.$(OBJEXT) ini_parser.$(OBJEXT) substring.$(OBJEXT) \
    73         vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
     71        material.$(OBJEXT) texture.$(OBJEXT) base_object.$(OBJEXT) \
     72        ini_parser.$(OBJEXT) substring.$(OBJEXT) vector.$(OBJEXT) \
     73        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    7474        benchmark.$(OBJEXT)
    7575orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    … …  
    102102@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    103103@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
    104 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
    105 @AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Po ./$(DEPDIR)/state.Po \
     104@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po ./$(DEPDIR)/state.Po \
    106105@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po \
    107106@AMDEP_TRUE@    ./$(DEPDIR)/substring.Po ./$(DEPDIR)/terrain.Po \
    … …  
    241240MAINSRCDIR = .
    242241orxonox_DEPENDENCIES = lib/gui/libORXgui.a \
     242                       lib/sound/libORXsound.a \
    243243                       lib/event/libORXevent.a \
    244244                       lib/physics/libORXphysics.a \
    … …  
    247247
    248248orxonox_LDADD = lib/gui/libORXgui.a \
     249                lib/sound/libORXsound.a \
    249250                lib/event/libORXevent.a \
    250251                lib/physics/libORXphysics.a \
    … …  
    297298                 lib/graphics/importer/material.cc \
    298299                 lib/graphics/importer/texture.cc \
    299                  lib/sound/sound_engine.cc \
    300300                 lib/lang/base_object.cc \
    301301                 lib/util/ini_parser.cc \
    … …  
    369369                 lib/graphics/importer/material.h \
    370370                 lib/graphics/importer/texture.h \
    371                  lib/sound/sound_engine.h \
    372371                 lib/lang/base_object.h \
    373372                 lib/util/ini_parser.h \
    … …  
    406405          esac; \
    407406        done; \
    408         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     407        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    409408        cd $(top_srcdir) && \
    410           $(AUTOMAKE) --gnu  src/Makefile
     409          $(AUTOMAKE) --foreign  src/Makefile
    411410.PRECIOUS: Makefile
    412411Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    495494@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
    496495@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
    497 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
    498496@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/state.Po@am__quote@
    499497@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
    … …  
    12151213@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    12161214@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'lib/graphics/importer/texture.cc'; then $(CYGPATH_W) 'lib/graphics/importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/texture.cc'; fi`
    1217 
    1218 sound_engine.o: lib/sound/sound_engine.cc
    1219 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.o -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc; \
    1220 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi
    1221 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/sound/sound_engine.cc' object='sound_engine.o' libtool=no @AMDEPBACKSLASH@
    1222 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@
    1223 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1224 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc
    1225 
    1226 sound_engine.obj: lib/sound/sound_engine.cc
    1227 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.obj -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`; \
    1228 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi
    1229 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/sound/sound_engine.cc' object='sound_engine.obj' libtool=no @AMDEPBACKSLASH@
    1230 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@
    1231 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1232 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`
    12331215
    12341216base_object.o: lib/lang/base_object.cc
    … …  
    14661448
    14671449distdir: $(DISTFILES)
    1468         $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/sound $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
     1450        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities
    14691451        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14701452        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/lib/Makefile.am

    r4484 r4506  
    33
    44SUBDIRS = graphics \
     5          sound \
    56          event \
    67          physics \

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

    r4504 r4506  
    168168GTK_PROGS = gui
    169169SUBDIRS = graphics \
     170          sound \
    170171          event \
    171172          physics \
    … …  
    186187          esac; \
    187188        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
     189        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
    189190        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --gnu  src/lib/Makefile
     191          $(AUTOMAKE) --foreign  src/lib/Makefile
    191192.PRECIOUS: Makefile
    192193Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    212212          esac; \
    213213        done; \
    214         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/event/Makefile'; \
     214        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
    215215        cd $(top_srcdir) && \
    216           $(AUTOMAKE) --gnu  src/lib/event/Makefile
     216          $(AUTOMAKE) --foreign  src/lib/event/Makefile
    217217.PRECIOUS: Makefile
    218218Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
     181          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    181181          esac; \
    182182        done; \
    183         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
     183        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
    184184        cd $(top_srcdir) && \
    185           $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
     185          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
    186186.PRECIOUS: Makefile
    187187Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    241241          esac; \
    242242        done; \
    243         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
     243        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
    244244        cd $(top_srcdir) && \
    245           $(AUTOMAKE) --gnu  src/lib/gui/Makefile
     245          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
    246246.PRECIOUS: Makefile
    247247Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    209209          esac; \
    210210        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/particles/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
    212212        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --gnu  src/lib/particles/Makefile
     213          $(AUTOMAKE) --foreign  src/lib/particles/Makefile
    214214.PRECIOUS: Makefile
    215215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    217217          esac; \
    218218        done; \
    219         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
    220220        cd $(top_srcdir) && \
    221           $(AUTOMAKE) --gnu  src/lib/physics/Makefile
     221          $(AUTOMAKE) --foreign  src/lib/physics/Makefile
    222222.PRECIOUS: Makefile
    223223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/sound/Makefile.am

    r4505 r4506  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXphysics.a
     4noinst_LIBRARIES = libORXsound.a
    55
    6 libORXphysics_a_SOURCES = physics_interface.cc \
    7                           physics_connection.cc \
    8                           physics_engine.cc \
    9                           fields/field.cc \
    10                           fields/gravity.cc \
    11                           fields/point_gravity.cc \
    12                           fields/twirl.cc
     6libORXsound_a_SOURCES = sound_engine.cc
    137
    14 noinst_HEADERS= physics_interface.h \
    15                 physics_connection.h \
    16                 physics_engine.h \
    17                 fields/field.h \
    18                 fields/gravity.h \
    19                 fields/point_gravity.h \
    20                 fields/twirl.h
     8noinst_HEADERS= sound_engine.h

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

    r4505 r4506  
    1616
    1717
    18 SOURCES = $(libORXphysics_a_SOURCES)
     18SOURCES = $(libORXsound_a_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 subdir = src/lib/physics
     41subdir = src/lib/sound
    4242DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    4343        $(srcdir)/Makefile.in
    … …  
    5252AR = ar
    5353ARFLAGS = cru
    54 libORXphysics_a_AR = $(AR) $(ARFLAGS)
    55 libORXphysics_a_LIBADD =
    56 am_libORXphysics_a_OBJECTS = physics_interface.$(OBJEXT) \
    57         physics_connection.$(OBJEXT) physics_engine.$(OBJEXT) \
    58         field.$(OBJEXT) gravity.$(OBJEXT) point_gravity.$(OBJEXT) \
    59         twirl.$(OBJEXT)
    60 libORXphysics_a_OBJECTS = $(am_libORXphysics_a_OBJECTS)
     54libORXsound_a_AR = $(AR) $(ARFLAGS)
     55libORXsound_a_LIBADD =
     56am_libORXsound_a_OBJECTS = sound_engine.$(OBJEXT)
     57libORXsound_a_OBJECTS = $(am_libORXsound_a_OBJECTS)
    6158DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    6259depcomp = $(SHELL) $(top_srcdir)/depcomp
    6360am__depfiles_maybe = depfiles
    64 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/field.Po ./$(DEPDIR)/gravity.Po \
    65 @AMDEP_TRUE@    ./$(DEPDIR)/physics_connection.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/physics_engine.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/physics_interface.Po \
    68 @AMDEP_TRUE@    ./$(DEPDIR)/point_gravity.Po ./$(DEPDIR)/twirl.Po
     61@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/sound_engine.Po
    6962CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    7063        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    7265CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    7366        -o $@
    74 SOURCES = $(libORXphysics_a_SOURCES)
    75 DIST_SOURCES = $(libORXphysics_a_SOURCES)
     67SOURCES = $(libORXsound_a_SOURCES)
     68DIST_SOURCES = $(libORXsound_a_SOURCES)
    7669HEADERS = $(noinst_HEADERS)
    7770ETAGS = etags
    … …  
    187180target_vendor = @target_vendor@
    188181MAINSRCDIR = ../..
    189 noinst_LIBRARIES = libORXphysics.a
    190 libORXphysics_a_SOURCES = physics_interface.cc \
    191                           physics_connection.cc \
    192                           physics_engine.cc \
    193                           fields/field.cc \
    194                           fields/gravity.cc \
    195                           fields/point_gravity.cc \
    196                           fields/twirl.cc
    197 
    198 noinst_HEADERS = physics_interface.h \
    199                 physics_connection.h \
    200                 physics_engine.h \
    201                 fields/field.h \
    202                 fields/gravity.h \
    203                 fields/point_gravity.h \
    204                 fields/twirl.h
    205 
     182noinst_LIBRARIES = libORXsound.a
     183libORXsound_a_SOURCES = sound_engine.cc
     184noinst_HEADERS = sound_engine.h
    206185all: all-am
    207186
    … …  
    217196          esac; \
    218197        done; \
    219         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
     198        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/sound/Makefile'; \
    220199        cd $(top_srcdir) && \
    221           $(AUTOMAKE) --gnu  src/lib/physics/Makefile
     200          $(AUTOMAKE) --foreign  src/lib/sound/Makefile
    222201.PRECIOUS: Makefile
    223202Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    … …  
    240219clean-noinstLIBRARIES:
    241220        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
    242 libORXphysics.a: $(libORXphysics_a_OBJECTS) $(libORXphysics_a_DEPENDENCIES)
    243         -rm -f libORXphysics.a
    244         $(libORXphysics_a_AR) libORXphysics.a $(libORXphysics_a_OBJECTS) $(libORXphysics_a_LIBADD)
    245         $(RANLIB) libORXphysics.a
     221libORXsound.a: $(libORXsound_a_OBJECTS) $(libORXsound_a_DEPENDENCIES)
     222        -rm -f libORXsound.a
     223        $(libORXsound_a_AR) libORXsound.a $(libORXsound_a_OBJECTS) $(libORXsound_a_LIBADD)
     224        $(RANLIB) libORXsound.a
    246225
    247226mostlyclean-compile:
    … …  
    251230        -rm -f *.tab.c
    252231
    253 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/field.Po@am__quote@
    254 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gravity.Po@am__quote@
    255 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_connection.Po@am__quote@
    256 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_engine.Po@am__quote@
    257 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/physics_interface.Po@am__quote@
    258 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/point_gravity.Po@am__quote@
    259 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/twirl.Po@am__quote@
     232@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
    260233
    261234.cc.o:
    … …  
    274247@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    275248@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    276 
    277 field.o: fields/field.cc
    278 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT field.o -MD -MP -MF "$(DEPDIR)/field.Tpo" -c -o field.o `test -f 'fields/field.cc' || echo '$(srcdir)/'`fields/field.cc; \
    279 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/field.Tpo" "$(DEPDIR)/field.Po"; else rm -f "$(DEPDIR)/field.Tpo"; exit 1; fi
    280 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/field.cc' object='field.o' libtool=no @AMDEPBACKSLASH@
    281 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/field.Po' tmpdepfile='$(DEPDIR)/field.TPo' @AMDEPBACKSLASH@
    282 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    283 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o field.o `test -f 'fields/field.cc' || echo '$(srcdir)/'`fields/field.cc
    284 
    285 field.obj: fields/field.cc
    286 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT field.obj -MD -MP -MF "$(DEPDIR)/field.Tpo" -c -o field.obj `if test -f 'fields/field.cc'; then $(CYGPATH_W) 'fields/field.cc'; else $(CYGPATH_W) '$(srcdir)/fields/field.cc'; fi`; \
    287 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/field.Tpo" "$(DEPDIR)/field.Po"; else rm -f "$(DEPDIR)/field.Tpo"; exit 1; fi
    288 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/field.cc' object='field.obj' libtool=no @AMDEPBACKSLASH@
    289 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/field.Po' tmpdepfile='$(DEPDIR)/field.TPo' @AMDEPBACKSLASH@
    290 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    291 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o field.obj `if test -f 'fields/field.cc'; then $(CYGPATH_W) 'fields/field.cc'; else $(CYGPATH_W) '$(srcdir)/fields/field.cc'; fi`
    292 
    293 gravity.o: fields/gravity.cc
    294 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gravity.o -MD -MP -MF "$(DEPDIR)/gravity.Tpo" -c -o gravity.o `test -f 'fields/gravity.cc' || echo '$(srcdir)/'`fields/gravity.cc; \
    295 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gravity.Tpo" "$(DEPDIR)/gravity.Po"; else rm -f "$(DEPDIR)/gravity.Tpo"; exit 1; fi
    296 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/gravity.cc' object='gravity.o' libtool=no @AMDEPBACKSLASH@
    297 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gravity.Po' tmpdepfile='$(DEPDIR)/gravity.TPo' @AMDEPBACKSLASH@
    298 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    299 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gravity.o `test -f 'fields/gravity.cc' || echo '$(srcdir)/'`fields/gravity.cc
    300 
    301 gravity.obj: fields/gravity.cc
    302 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gravity.obj -MD -MP -MF "$(DEPDIR)/gravity.Tpo" -c -o gravity.obj `if test -f 'fields/gravity.cc'; then $(CYGPATH_W) 'fields/gravity.cc'; else $(CYGPATH_W) '$(srcdir)/fields/gravity.cc'; fi`; \
    303 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/gravity.Tpo" "$(DEPDIR)/gravity.Po"; else rm -f "$(DEPDIR)/gravity.Tpo"; exit 1; fi
    304 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/gravity.cc' object='gravity.obj' libtool=no @AMDEPBACKSLASH@
    305 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/gravity.Po' tmpdepfile='$(DEPDIR)/gravity.TPo' @AMDEPBACKSLASH@
    306 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    307 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gravity.obj `if test -f 'fields/gravity.cc'; then $(CYGPATH_W) 'fields/gravity.cc'; else $(CYGPATH_W) '$(srcdir)/fields/gravity.cc'; fi`
    308 
    309 point_gravity.o: fields/point_gravity.cc
    310 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT point_gravity.o -MD -MP -MF "$(DEPDIR)/point_gravity.Tpo" -c -o point_gravity.o `test -f 'fields/point_gravity.cc' || echo '$(srcdir)/'`fields/point_gravity.cc; \
    311 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/point_gravity.Tpo" "$(DEPDIR)/point_gravity.Po"; else rm -f "$(DEPDIR)/point_gravity.Tpo"; exit 1; fi
    312 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/point_gravity.cc' object='point_gravity.o' libtool=no @AMDEPBACKSLASH@
    313 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/point_gravity.Po' tmpdepfile='$(DEPDIR)/point_gravity.TPo' @AMDEPBACKSLASH@
    314 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    315 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o point_gravity.o `test -f 'fields/point_gravity.cc' || echo '$(srcdir)/'`fields/point_gravity.cc
    316 
    317 point_gravity.obj: fields/point_gravity.cc
    318 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT point_gravity.obj -MD -MP -MF "$(DEPDIR)/point_gravity.Tpo" -c -o point_gravity.obj `if test -f 'fields/point_gravity.cc'; then $(CYGPATH_W) 'fields/point_gravity.cc'; else $(CYGPATH_W) '$(srcdir)/fields/point_gravity.cc'; fi`; \
    319 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/point_gravity.Tpo" "$(DEPDIR)/point_gravity.Po"; else rm -f "$(DEPDIR)/point_gravity.Tpo"; exit 1; fi
    320 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/point_gravity.cc' object='point_gravity.obj' libtool=no @AMDEPBACKSLASH@
    321 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/point_gravity.Po' tmpdepfile='$(DEPDIR)/point_gravity.TPo' @AMDEPBACKSLASH@
    322 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    323 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o point_gravity.obj `if test -f 'fields/point_gravity.cc'; then $(CYGPATH_W) 'fields/point_gravity.cc'; else $(CYGPATH_W) '$(srcdir)/fields/point_gravity.cc'; fi`
    324 
    325 twirl.o: fields/twirl.cc
    326 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT twirl.o -MD -MP -MF "$(DEPDIR)/twirl.Tpo" -c -o twirl.o `test -f 'fields/twirl.cc' || echo '$(srcdir)/'`fields/twirl.cc; \
    327 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/twirl.Tpo" "$(DEPDIR)/twirl.Po"; else rm -f "$(DEPDIR)/twirl.Tpo"; exit 1; fi
    328 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/twirl.cc' object='twirl.o' libtool=no @AMDEPBACKSLASH@
    329 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/twirl.Po' tmpdepfile='$(DEPDIR)/twirl.TPo' @AMDEPBACKSLASH@
    330 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    331 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o twirl.o `test -f 'fields/twirl.cc' || echo '$(srcdir)/'`fields/twirl.cc
    332 
    333 twirl.obj: fields/twirl.cc
    334 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT twirl.obj -MD -MP -MF "$(DEPDIR)/twirl.Tpo" -c -o twirl.obj `if test -f 'fields/twirl.cc'; then $(CYGPATH_W) 'fields/twirl.cc'; else $(CYGPATH_W) '$(srcdir)/fields/twirl.cc'; fi`; \
    335 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/twirl.Tpo" "$(DEPDIR)/twirl.Po"; else rm -f "$(DEPDIR)/twirl.Tpo"; exit 1; fi
    336 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='fields/twirl.cc' object='twirl.obj' libtool=no @AMDEPBACKSLASH@
    337 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/twirl.Po' tmpdepfile='$(DEPDIR)/twirl.TPo' @AMDEPBACKSLASH@
    338 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    339 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o twirl.obj `if test -f 'fields/twirl.cc'; then $(CYGPATH_W) 'fields/twirl.cc'; else $(CYGPATH_W) '$(srcdir)/fields/twirl.cc'; fi`
    340249uninstall-info-am:
    341250
    … …  
    389298
    390299distdir: $(DISTFILES)
    391         $(mkdir_p) $(distdir)/fields
    392300        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    393301        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/lib/sound/sound_engine.cc

    r4504 r4506  
    242242   \brief Sets the doppler values of openAL
    243243   \param dopplerFactor the extent of the doppler-effect
    244    \param the Speed the sound travels
     244   \param dopplerVelocity the Speed the sound travels
    245245*/
    246246void SoundEngine::setDopplerValues(ALfloat dopplerFactor, ALfloat dopplerVelocity)

  • orxonox/trunk/src/lib/sound/sound_engine.h

    r4504 r4506  
    1111
    1212
    13 #define SOUND_DOPPLER_FACTOR     0.001          //!< A factor for the audible doppler effect
    14 #define SOUND_DOPPLER_VELOCITY   5000000     //!< A factor for the TravelSpeed of sound
     13#define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
     14#define SOUND_DOPPLER_VELOCITY     5000000        //!< A factor for the TravelSpeed of sound
    1515
    1616// FORWARD DEFINITION
    … …  
    2626  ~SoundBuffer(void);
    2727
    28   /** \returns the ID of the buffer */
     28  /** \returns the ID of the buffer used in this SoundBuffer */
    2929  inline ALuint getID(void) { return this->bufferID; }
    3030
    3131 private:
    32   ALuint bufferID;              //!< The address of the Buffer.
     32  ALuint        bufferID;             //!< The address of the Buffer.
    3333
    34   ALsizei size;                 //!< The size of the Buffer.
    35   ALboolean loop;               //!< loop information.
     34  ALsizei       size;                 //!< The size of the Buffer.
     35  ALboolean     loop;                 //!< loop information.
    3636};
    3737
    … …  
    4242  SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL);
    4343  ~SoundSource(void);
    44 
     44 
    4545  // user interaction
    4646  void play();
    … …  
    4848  void pause();
    4949  void rewind();
    50 
     50 
    5151  // development functions
    5252  /** \returns The ID of this Source */
    … …  
    6060
    6161 private:
    62   ALuint sourceID;              //!< The ID of the Source
    63   SoundBuffer* buffer;          //!< The buffer to play in this source.
    64   PNode* sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
     62  ALuint           sourceID;              //!< The ID of the Source
     63  SoundBuffer*     buffer;                //!< The buffer to play in this source.
     64  PNode*           sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
    6565};
    6666
    … …  
    9999 private:
    100100  SoundEngine(void);
    101   static SoundEngine* singletonRef;
     101  static SoundEngine*      singletonRef;             //!< Reference to this class
    102102
    103103
    104   PNode* listener;                 //!< The listener of the Scene
    105   tList<SoundBuffer>* bufferList;  //!< A list of buffers
    106   tList<SoundSource>* sourceList;  //!< A list for all the sources in the scene.
     104  PNode*                   listener;                 //!< The listener of the Scene
     105  tList<SoundBuffer>*      bufferList;               //!< A list of buffers
     106  tList<SoundSource>*      sourceList;               //!< A list for all the sources in the scene.
    107107
    108108};

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

    r4504 r4506  
    204204          esac; \
    205205        done; \
    206         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
    207207        cd $(top_srcdir) && \
    208           $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
     208          $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
    209209.PRECIOUS: Makefile
    210210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    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

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

    r4504 r4506  
    228228          esac; \
    229229        done; \
    230         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile'; \
     230        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile'; \
    231231        cd $(top_srcdir) && \
    232           $(AUTOMAKE) --gnu  src/subprojects/gui/Makefile
     232          $(AUTOMAKE) --foreign  src/subprojects/gui/Makefile
    233233.PRECIOUS: Makefile
    234234Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    237237          esac; \
    238238        done; \
    239         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
     239        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
    240240        cd $(top_srcdir) && \
    241           $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
     241          $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
    242242.PRECIOUS: Makefile
    243243Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    260260          esac; \
    261261        done; \
    262         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
     262        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
    263263        cd $(top_srcdir) && \
    264           $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
     264          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
    265265.PRECIOUS: Makefile
    266266Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r4504 r4506  
    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.