From 635bc62fa1795f910b7e95aed6592856e17118d8 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 6 Jan 2017 13:01:46 +0200 Subject: [PATCH] Fix compilation on OS X --- Build | 2 ++ source/al.h | 10 ++++++++++ source/buffer.h | 2 +- source/context.h | 4 ++++ source/device.h | 4 ++++ source/format.h | 2 +- source/listener.h | 2 +- source/source.h | 2 +- 8 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 source/al.h diff --git a/Build b/Build index db2b660..4517ad5 100644 --- 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 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 +#else +#include +#endif + +#endif diff --git a/source/buffer.h b/source/buffer.h index 38ca36d..3780b0b 100644 --- a/source/buffer.h +++ b/source/buffer.h @@ -2,8 +2,8 @@ #define MSP_AL_BUFFER_H_ #include -#include #include +#include "al.h" #include "format.h" #include "types.h" diff --git a/source/context.h b/source/context.h index 5f82418..7bb67af 100644 --- 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 +#else #include +#endif namespace Msp { namespace AL { diff --git a/source/device.h b/source/device.h index 4384aa4..117a551 100644 --- a/source/device.h +++ b/source/device.h @@ -2,7 +2,11 @@ #define MSP_AL_DEVICE_H_ #include +#ifdef __APPLE__ +#include +#else #include +#endif namespace Msp { namespace AL { diff --git a/source/format.h b/source/format.h index a940d25..ed6a144 100644 --- a/source/format.h +++ b/source/format.h @@ -1,7 +1,7 @@ #ifndef MSP_AL_FORMAT_H_ #define MSP_AL_FORMAT_H_ -#include +#include "al.h" namespace Msp { namespace AL { diff --git a/source/listener.h b/source/listener.h index 9cc5b7a..ae222ae 100644 --- a/source/listener.h +++ b/source/listener.h @@ -1,7 +1,7 @@ #ifndef MSP_AL_LISTENER_H_ #define MSP_AL_LISTENER_H_ -#include +#include "al.h" namespace Msp { namespace AL { diff --git a/source/source.h b/source/source.h index 761e791..8de3d02 100644 --- a/source/source.h +++ b/source/source.h @@ -2,7 +2,7 @@ #define MSP_AL_SOURCE_H_ #include -#include +#include "al.h" #include "types.h" namespace Msp { -- 2.43.0