Changeset 7664

Timestamp:

Nov 24, 2010, 3:48:56 PM (13 years ago)

Author:

youngk

Message:

Corrected some serious bug in OpenAL Mac and reduced warnings.

Location:

code/branches/ois_update/src

Files:

• external/openal (added)
• external/openal/MacOSX_OALExtensions.h (added)
• external/openal/README (added)
• external/openal/al.h (added)
• external/openal/alc.h (added)
• libraries/core/GraphicsManager.cc (modified) (1 diff)
• orxonox/sound/BaseSound.cc (modified) (1 diff)
• orxonox/sound/SoundBuffer.cc (modified) (1 diff)
• orxonox/sound/SoundStreamer.cc (modified) (1 diff)

code/branches/ois_update/src/libraries/core/GraphicsManager.cc

@@ -316 +316 @@
                 
 // HACK
-#ifdef __APPLE_CC__
+#ifdef ORXONOX_PLATFORM_APPLE
         //INFO: This will give our window focus, and not lock it to the terminal
         ProcessSerialNumber psn = {0, kCurrentProcess};

code/branches/ois_update/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/ois_update/src/orxonox/sound/SoundBuffer.cc

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

code/branches/ois_update/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"