Changeset 394 for code/branches/audio/src

Timestamp:

Dec 5, 2007, 3:00:26 PM (17 years ago)

Author:

nicolape

Message:

Oggvorbis includes and linking now working

Location:

code/branches/audio/src/audio

Files:

• AudioBuffer.h (modified) (1 diff)
• AudioIncludes.h (added)
• AudioManager.cc (modified) (1 diff)
• AudioManager.h (modified) (2 diffs)
• AudioSource.h (modified) (1 diff)
• CMakeLists.txt (modified) (2 diffs)
• _Ambient.cc (deleted)
• _Ambient.h (deleted)
• _AudioObject.cc (deleted)
• _AudioObject.h (deleted)

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

@@ -2 +2 @@
 #define AUDIOBUFFER_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alut.h>
+#include "AudioIncludes.h"
 
 namespace audio

code/branches/audio/src/audio/AudioManager.cc

@@ -5 +5 @@
         AudioManager::AudioManager()
         {
-                
+        
         }
                 

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

@@ -2 +2 @@
 #define AUDIOMANAGER_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alut.h>
+#include "AudioIncludes.h"
 
 #include "AudioBuffer.h"
@@ -33 +27 @@
                 void loadParams();
         private:
-
-        
                 // Vector containing all audio files
                 std::vector<AudioBuffer> buffers;

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

@@ -2 +2 @@
 #define AUDIOSOURCE_H_
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alut.h>
+#include "AudioIncludes.h"
 
 namespace audio

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

@@ -7 +7 @@
 )
 SET(INC_FILES 
+        AudioIncludes.h
         AudioManager.h
         AudioBuffer.h
@@ -15 +16 @@
 ADD_LIBRARY(audio ${SRC_FILES} ${INC_FILES})
 
-TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY})
+TARGET_LINK_LIBRARIES(audio ${OPENAL_LIBRARY} ${ALUT_LIBRARY} ${OGGVORBIS_LIBRARY}  ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY})