Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 4, 2007, 3:11:29 PM (17 years ago)
Author:
nicolape
Message:

Added tardis alut dir and changed cmake to load all audio stuff from system libs

Location:
code/branches/audio/src
Files:
1 deleted
5 edited
4 moved

Legend:

Unmodified
Added
Removed

  • code/branches/audio/src/audio

    • Property svn:ignore set to
      cmake_install.cmake
      CMakeFiles
      libaudio.a
      Makefile

  • code/branches/audio/src/audio/AudioBuffer.h

    r350 r377  
    66#include <vector>
    77
    8 #include "../../include/AL/al.h"
    9 #include "../../include/AL/alc.h"
    10 #include "../../include/AL/alut.h"
     8#include <AL/al.h>
     9#include <AL/alc.h>
     10#include <AL/alut.h>
    1111
    1212namespace audio

  • code/branches/audio/src/audio/AudioManager.h

    r349 r377  
    66#include <vector>
    77
    8 #include "../../include/AL/al.h"
    9 #include "../../include/AL/alc.h"
    10 #include "../../include/AL/alut.h"
     8#include <AL/al.h>
     9#include <AL/alc.h>
     10#include <AL/alut.h>
    1111
    1212#include "AudioBuffer.h"
    … …  
    3030                // upwards the listener)
    3131                void setOri(std::vector<float> at, std::vector<float> up);
     32                // Parses given xml string
     33                void loadParams();
    3234        private:
     35
     36       
    3337                // Vector containing all audio files
    3438                std::vector<AudioBuffer> buffers;

  • code/branches/audio/src/audio/AudioSource.h

    r349 r377  
    66#include <vector>
    77
    8 #include "../../include/AL/al.h"
    9 #include "../../include/AL/alc.h"
    10 #include "../../include/AL/alut.h"
     8#include <AL/al.h>
     9#include <AL/alc.h>
     10#include <AL/alut.h>
    1111
    1212namespace audio

  • code/branches/audio/src/audio/_AudioObject.h

    r347 r377  
    3333                ALfloat ListenerVel[3];
    3434                ALfloat ListenerOri[6];
    35         };
    36        
    37        
    38        
    39        
    40        
     35        };     
    4136}
    4237

  • code/branches/audio/src/orxonox/CMakeLists.txt

    r334 r377  
    66ADD_EXECUTABLE(../../bin/main ${SRC_FILES} ${INC_FILES})
    77
    8 TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${OPENAL_LIBRARIES} loader audio)
     8TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader audio)
    99
    1010INCLUDE_DIRECTORIES(..)
Note: See TracChangeset for help on using the changeset viewer.