Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4750 in orxonox.OLD


Ignore:
Timestamp:
Jul 1, 2005, 6:12:16 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: injected the ogg-player into orxonox

Location:
orxonox/trunk/src/lib
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/lang/class_list.cc

    r4748 r4750  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Benjamin Grauer
    1313   co-programmer: ...
    1414*/

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

    r4506 r4750  
    22include $(MAINSRCDIR)/defs/include_paths.am
    33
    4 noinst_LIBRARIES = libORXsound.a 
     4noinst_LIBRARIES = libORXsound.a
    55
    6 libORXsound_a_SOURCES = sound_engine.cc
     6libORXsound_a_SOURCES = sound_engine.cc \
     7                        ogg_player.cc
    78
    8 noinst_HEADERS= sound_engine.h
     9noinst_HEADERS = sound_engine.h \
     10                 ogg_player.h

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

    r4506 r4750  
    5454libORXsound_a_AR = $(AR) $(ARFLAGS)
    5555libORXsound_a_LIBADD =
    56 am_libORXsound_a_OBJECTS = sound_engine.$(OBJEXT)
     56am_libORXsound_a_OBJECTS = sound_engine.$(OBJEXT) ogg_player.$(OBJEXT)
    5757libORXsound_a_OBJECTS = $(am_libORXsound_a_OBJECTS)
    5858DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    5959depcomp = $(SHELL) $(top_srcdir)/depcomp
    6060am__depfiles_maybe = depfiles
    61 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/sound_engine.Po
     61@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ogg_player.Po \
     62@AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Po
    6263CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    6364        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    … …  
    180181target_vendor = @target_vendor@
    181182MAINSRCDIR = ../..
    182 noinst_LIBRARIES = libORXsound.a
    183 libORXsound_a_SOURCES = sound_engine.cc
    184 noinst_HEADERS = sound_engine.h
     183noinst_LIBRARIES = libORXsound.a
     184libORXsound_a_SOURCES = sound_engine.cc \
     185                        ogg_player.cc
     186
     187noinst_HEADERS = sound_engine.h \
     188                 ogg_player.h
     189
    185190all: all-am
    186191
    … …  
    230235        -rm -f *.tab.c
    231236
     237@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_player.Po@am__quote@
    232238@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
    233239
Note: See TracChangeset for help on using the changeset viewer.