Fix compilation on OS X

diff --git a/Build b/Build
index db2b66045e0738b7673425aa4f396bb24d3b22b6..4517ad5151587beebba25104e46a921a9851e20e 100644 (file)
--- a/Build
+++ b/Build
@@ -5,7 +5,9 @@ package "mspal"
 
        require "vorbisfile";
        require "openal";
+       require "sigc++-2.0";
        require "mspcore";
+       require "mspdatafile";
 
        library "mspal"
        {

diff --git a/source/al.h b/source/al.h
new file mode 100644 (file)
index 0000000..6310877
--- /dev/null
+++ b/source/al.h
@@ -0,0 +1,10 @@
+#ifndef MSP_AL_AL_H_
+#define MSP_AL_AL_H_
+
+#ifdef __APPLE__
+#include <OpenAL/al.h>
+#else
+#include <AL/al.h>
+#endif
+
+#endif

diff --git a/source/buffer.h b/source/buffer.h
index 38ca36d6047f3417bd0b5a5b01292b7b126e4f5a..3780b0b410d8f8c3161f0c6ba3fafc8da000ac45 100644 (file)
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -2,8 +2,8 @@
 #define MSP_AL_BUFFER_H_
 
 #include <string>
-#include <AL/al.h>
 #include <msp/datafile/loader.h>
+#include "al.h"
 #include "format.h"
 #include "types.h"
 

diff --git a/source/context.h b/source/context.h
index 5f82418d3cb2840add2dbe9abd157606b6c03ba2..7bb67af3b4bf8726de1e7d79fad293b164df8959 100644 (file)
--- a/source/context.h
+++ b/source/context.h
@@ -1,7 +1,11 @@
 #ifndef MSP_AL_CONTEXT_H_
 #define MSP_AL_CONTEXT_H_
 
+#ifdef __APPLE__
+#include <OpenAL/alc.h>
+#else
 #include <AL/alc.h>
+#endif
 
 namespace Msp {
 namespace AL {

diff --git a/source/device.h b/source/device.h
index 4384aa41f33229682e20603ddd1c6b2907041e38..117a5514e67ce8e84e5d60f79235312b0562be22 100644 (file)
--- a/source/device.h
+++ b/source/device.h
@@ -2,7 +2,11 @@
 #define MSP_AL_DEVICE_H_
 
 #include <string>
+#ifdef __APPLE__
+#include <OpenAL/alc.h>
+#else
 #include <AL/alc.h>
+#endif
 
 namespace Msp {
 namespace AL {

diff --git a/source/format.h b/source/format.h
index a940d257b1345d7b8ae34ec10e098205787e7c7c..ed6a1442750a73056102af93e76bb9d40b5edc0e 100644 (file)
--- a/source/format.h
+++ b/source/format.h
@@ -1,7 +1,7 @@
 #ifndef MSP_AL_FORMAT_H_
 #define MSP_AL_FORMAT_H_
 
-#include <AL/al.h>
+#include "al.h"
 
 namespace Msp {
 namespace AL {

diff --git a/source/listener.h b/source/listener.h
index 9cc5b7a3124f22fa2d54b4b7368c7e9364978feb..ae222ae7bf7e5233ab8a06140dbe3a1f398807a1 100644 (file)
--- a/source/listener.h
+++ b/source/listener.h
@@ -1,7 +1,7 @@
 #ifndef MSP_AL_LISTENER_H_
 #define MSP_AL_LISTENER_H_
 
-#include <AL/al.h>
+#include "al.h"
 
 namespace Msp {
 namespace AL {

diff --git a/source/source.h b/source/source.h
index 761e79175b8afaa6f3573a5e31e909b900c165b7..8de3d0284d109fe1b3524539937d655748e7055a 100644 (file)
--- a/source/source.h
+++ b/source/source.h
@@ -2,7 +2,7 @@
 #define MSP_AL_SOURCE_H_
 
 #include <vector>
-#include <AL/al.h>
+#include "al.h"
 #include "types.h"
 
 namespace Msp {