Changeset 8056 for code/branches/mac_osx/src/orxonox/sound

Timestamp:

Mar 10, 2011, 5:52:31 PM (14 years ago)

Author:

rgrieder

Message:

Fiddled around with ALUT and OpenAL headers.
The hack in PackageConfigOSX.cmake is just a guess so it really needs testing.

All ALUT and OpenAL headers should now be included with <alut.h> or <al.h> respectively because FindOpenAL.cmake defines the include directories this way.
There is still a hack in LibraryConfig.cmake for non MSVC/Apple systems because alut.h includes al.h with AL/al.h on most systems.

Location:

code/branches/mac_osx/src/orxonox/sound

Files:

• BaseSound.cc (modified) (1 diff)
• SoundBuffer.cc (modified) (1 diff)
• SoundManager.cc (modified) (1 diff)
• SoundStreamer.cc (modified) (1 diff)
• WorldSound.cc (modified) (1 diff)

code/branches/mac_osx/src/orxonox/sound/BaseSound.cc

@@ -31 +31 @@
 #include <cassert>
 #include <vector>
-
-#ifdef ORXONOX_PLATFORM_APPLE
-#include "openal/al.h"
-#else
 #include <al.h>
-#endif
 
 #include "util/Math.h"

code/branches/mac_osx/src/orxonox/sound/SoundBuffer.cc

@@ -30 +30 @@
 #include "SoundBuffer.h"
 
-#if defined(ORXONOX_PLATFORM_APPLE)
-#include <ALUT/alut.h>
-#else
-#include <AL/alut.h>
-#endif
+#include <alut.h>
 #include <vorbis/vorbisfile.h>
 

code/branches/mac_osx/src/orxonox/sound/SoundManager.cc

@@ -31 +31 @@
 #include "SoundManager.h"
 
-#if defined(__APPLE__)
-#include <ALUT/alut.h>
-#else
-#include <AL/alut.h>
-#endif
 #include <utility>
+#include <alut.h>
 #include <loki/ScopeGuard.h>
 

code/branches/mac_osx/src/orxonox/sound/SoundStreamer.cc

@@ -27 +27 @@
 #include "SoundStreamer.h"
 
-#ifdef ORXONOX_PLATFORM_APPLE
-#include "openal/al.h"
-#else
 #include <al.h>
-#endif
-
 #include <vorbis/vorbisfile.h>
 #include "SoundManager.h"

code/branches/mac_osx/src/orxonox/sound/WorldSound.cc

@@ -30 +30 @@
 #include "WorldSound.h"
 
-#if defined(__APPLE__)
-#include <ALUT/alut.h>
-#else
-#include <AL/alut.h>
-#endif
+#include <alut.h>
+
 #include "util/Math.h"
 #include "core/CoreIncludes.h"