Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 394


Ignore:
Timestamp:
Dec 5, 2007, 3:00:26 PM (17 years ago)
Author:
nicolape
Message:

Oggvorbis includes and linking now working

Location:
code/branches/audio
Files:
1 added
4 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/audio/CMakeLists.txt

    r388 r394  
    5454
    5555#Sets the search paths for the linking
    56 LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY} core objects loader network weapon classHierarchy audio)
     56LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${Boost_LIBRARY_DIRS} core objects loader network weapon classHierarchy audio)
    5757#Sets the search path for include files
    58 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${OGGVORBIS_INCLUDE_DIR})
     58INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${ALUT_INCLUDE_DIR} ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
    5959
    6060#add main source dir
  • code/branches/audio/cmake/FindOggVorbis.cmake

    r388 r394  
    11
    2 SET(OGGVORBIS_LIBRARY_DIR "/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/lib")
    3 SET(OGGVORBIS_LIBRARY "${OGGVORBIS_LIBRARY_DIR}/libvorbisenc.so ${OGGVORBIS_LIBRARY_DIR}/libvorbisfile.so ${OGGVORBIS_LIBRARY_DIR}/libogg.so ${OGGVORBIS_LIBRARY_DIR}/libvorbis.so ")
    4 SET(OGGVORBIS_INCLUDE_DIR "/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include")
     2#SET(OGGVORBIS_LIBRARY_DIR "/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/lib")
     3#SET(OGGVORBIS_LIBRARY "-L ${OGGVORBIS_LIBRARY_DIR} -lvorbisenc -lvorbisfile -logg -lvorbis ")
     4#SET(OGGVORBIS_INCLUDE_DIR "/usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include")
    55
    6 MESSAGE(STATUS "OggVorbis was found. Libdir ${OGGVORBIS_LIBRARY_DIR} Includedir ${OGGVORBIS_INCLUDE_DIR}")
     6#
     7# Includes
     8#
     9
     10FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h
     11  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include               # Tardis specific hack
     12  /usr/local/include
     13  /usr/include
     14  /sw/include
     15  /opt/local/include
     16  /opt/csw/include
     17  /opt/csw/include
     18  /opt/include
     19  )
     20
     21FIND_PATH(VORBIS_INCLUDE_DIR vorbis/codec.h
     22  /usr/pack/oggvorbis-1.0-ds/i686-debian-linux3.0/include               # Tardis specific hack
     23  /usr/local/include
     24  /usr/include
     25  /sw/include
     26  /opt/local/include
     27  /opt/csw/include
     28  /opt/csw/include
     29  /opt/include
     30  )
     31
     32#
     33# Libs
     34#
     35
     36FIND_LIBRARY(OGG_LIBRARY
     37  NAMES ogg
     38  PATHS
     39        /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     40  /usr/local/lib
     41  /usr/lib
     42  /sw/lib
     43  /opt/local/lib
     44  /opt/csw/lib
     45  /opt/lib
     46  )
     47
     48FIND_LIBRARY(VORBIS_LIBRARY
     49  NAMES vorbis
     50  PATHS
     51        /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     52  /usr/local/lib
     53  /usr/lib
     54  /sw/lib
     55  /opt/local/lib
     56  /opt/csw/lib
     57  /opt/lib
     58  )
     59
     60FIND_LIBRARY(VORBISENC_LIBRARY
     61  NAMES vorbisenc
     62  PATHS
     63        /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     64  /usr/local/lib
     65  /usr/lib
     66  /sw/lib
     67  /opt/local/lib
     68  /opt/csw/lib
     69  /opt/lib
     70  )
     71
     72FIND_LIBRARY(VORBISFILE_LIBRARY
     73  NAMES vorbisfile
     74  PATHS
     75        /usr/pack/openal-0.0.8-cl/i686-debian-linux3.1/lib
     76  /usr/local/lib
     77  /usr/lib
     78  /sw/lib
     79  /opt/local/lib
     80  /opt/csw/lib
     81  /opt/lib
     82  )
     83
     84SET(OGG_FOUND "NO")
     85IF(OGG_LIBRARY)
     86  SET(OGG_FOUND "YES")
     87        MESSAGE(STATUS "Ogg was found. Libdir ${OGG_LIBRARY} Includedir ${OGG_INCLUDE_DIR}")
     88ENDIF(OGG_LIBRARY)
     89
     90SET(VORBIS_FOUND "NO")
     91IF(VORBIS_LIBRARY)
     92  SET(VORBIS_FOUND "YES")
     93        MESSAGE(STATUS "Vorbis was found. Libdir ${VORBIS_LIBRARY} Includedir ${VORBIS_INCLUDE_DIR}")
     94ENDIF(VORBIS_LIBRARY)
     95
  • code/branches/audio/src/audio/AudioBuffer.h

    r377 r394  
    22#define AUDIOBUFFER_H_
    33
    4 #include <iostream>
    5 #include <string>
    6 #include <vector>
    7 
    8 #include <AL/al.h>
    9 #include <AL/alc.h>
    10 #include <AL/alut.h>
     4#include "AudioIncludes.h"
    115
    126namespace audio
  • code/branches/audio/src/audio/AudioManager.cc

    r349 r394  
    55        AudioManager::AudioManager()
    66        {
    7                
     7       
    88        }
    99               
  • code/branches/audio/src/audio/AudioManager.h

    r377 r394  
    22#define AUDIOMANAGER_H_
    33
    4 #include <iostream>
    5 #include <string>
    6 #include <vector>
    7 
    8 #include <AL/al.h>
    9 #include <AL/alc.h>
    10 #include <AL/alut.h>
     4#include "AudioIncludes.h"
    115
    126#include "AudioBuffer.h"
     
    3327                void loadParams();
    3428        private:
    35 
    36        
    3729                // Vector containing all audio files
    3830                std::vector<AudioBuffer> buffers;
  • code/branches/audio/src/audio/AudioSource.h

    r377 r394  
    22#define AUDIOSOURCE_H_
    33
    4 #include <iostream>
    5 #include <string>
    6 #include <vector>
    7 
    8 #include <AL/al.h>
    9 #include <AL/alc.h>
    10 #include <AL/alut.h>
     4#include "AudioIncludes.h"
    115
    126namespace audio
  • code/branches/audio/src/audio/CMakeLists.txt

    r388 r394  
    77)
    88SET(INC_FILES
     9        AudioIncludes.h
    910        AudioManager.h
    1011        AudioBuffer.h
     
    1516ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})
    1617
    17 TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY})
     18TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY}  ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY})
    1819
    1920
Note: See TracChangeset for help on using the changeset viewer.