diff --git a/src/Magnum/Audio/Audio.cpp b/src/Magnum/Audio/Audio.cpp index 3095ef763..1c6af624b 100644 --- a/src/Magnum/Audio/Audio.cpp +++ b/src/Magnum/Audio/Audio.cpp @@ -24,11 +24,15 @@ */ #include -#include #include "Corrade/configure.h" #include "Magnum/Types.h" +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif +#include + namespace Magnum { namespace Audio { /* Verify types */ diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h index f167386f5..81213e3d2 100644 --- a/src/Magnum/Audio/Buffer.h +++ b/src/Magnum/Audio/Buffer.h @@ -32,9 +32,6 @@ #include #include -#include -#include -#include "MagnumExternal/OpenAL/extensions.h" #include @@ -42,6 +39,13 @@ #include "Magnum/Audio/Audio.h" #include "Magnum/Audio/visibility.h" +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif +#include +#include +#include "MagnumExternal/OpenAL/extensions.h" + namespace Magnum { namespace Audio { /** @brief Sample buffer */ diff --git a/src/Magnum/Audio/BufferFormat.h b/src/Magnum/Audio/BufferFormat.h index 6b96d0610..7dab542fe 100644 --- a/src/Magnum/Audio/BufferFormat.h +++ b/src/Magnum/Audio/BufferFormat.h @@ -29,12 +29,15 @@ * @brief Enum @ref Magnum::Audio::BufferFormat */ -#include -#include "MagnumExternal/OpenAL/extensions.h" - #include "Magnum/Magnum.h" #include "Magnum/Audio/visibility.h" +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif +#include +#include "MagnumExternal/OpenAL/extensions.h" + namespace Magnum { namespace Audio { /** diff --git a/src/Magnum/Audio/Context.cpp b/src/Magnum/Audio/Context.cpp index ddb744a5f..4458c7d4f 100644 --- a/src/Magnum/Audio/Context.cpp +++ b/src/Magnum/Audio/Context.cpp @@ -27,8 +27,6 @@ #include "Context.h" -#include -#include #include #include #include diff --git a/src/Magnum/Audio/Context.h b/src/Magnum/Audio/Context.h index 324069f0e..57ae0ccc2 100644 --- a/src/Magnum/Audio/Context.h +++ b/src/Magnum/Audio/Context.h @@ -35,8 +35,6 @@ #include #include #include -#include -#include #include #include @@ -44,6 +42,12 @@ #include "Magnum/Tags.h" #include "Magnum/Audio/visibility.h" #include "Magnum/Math/BoolVector.h" + +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif +#include +#include #include "MagnumExternal/OpenAL/extensions.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Renderer.h b/src/Magnum/Audio/Renderer.h index 3308019cb..3ca518c60 100644 --- a/src/Magnum/Audio/Renderer.h +++ b/src/Magnum/Audio/Renderer.h @@ -30,13 +30,17 @@ */ #include -#include #include "Magnum/Magnum.h" #include "Magnum/Audio/Context.h" #include "Magnum/Audio/visibility.h" #include "Magnum/Math/Vector3.h" +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif +#include + namespace Magnum { namespace Audio { /** @brief Global renderer configuration */ diff --git a/src/Magnum/Audio/Source.h b/src/Magnum/Audio/Source.h index 46acc6ffb..05005e045 100644 --- a/src/Magnum/Audio/Source.h +++ b/src/Magnum/Audio/Source.h @@ -33,7 +33,6 @@ #include #include #include -#include #include @@ -42,6 +41,11 @@ #include "Magnum/Audio/visibility.h" #include "Magnum/Math/Vector3.h" +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif +#include + namespace Magnum { namespace Audio { /** diff --git a/src/MagnumExternal/OpenAL/extensions.h b/src/MagnumExternal/OpenAL/extensions.h index deb3f14ee..20070ef9a 100644 --- a/src/MagnumExternal/OpenAL/extensions.h +++ b/src/MagnumExternal/OpenAL/extensions.h @@ -27,6 +27,11 @@ DEALINGS IN THE SOFTWARE. */ +#include + +#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED) +#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */ +#endif #include #include