Browse Source

Audio: disable annoying OpenAL deprecation warnings on Mac.

pull/525/head
Vladimír Vondruš 4 years ago
parent
commit
f3fc17e2b0
  1. 6
      src/Magnum/Audio/Audio.cpp
  2. 10
      src/Magnum/Audio/Buffer.h
  3. 9
      src/Magnum/Audio/BufferFormat.h
  4. 2
      src/Magnum/Audio/Context.cpp
  5. 8
      src/Magnum/Audio/Context.h
  6. 6
      src/Magnum/Audio/Renderer.h
  7. 6
      src/Magnum/Audio/Source.h
  8. 5
      src/MagnumExternal/OpenAL/extensions.h

6
src/Magnum/Audio/Audio.cpp

@ -24,11 +24,15 @@
*/
#include <type_traits>
#include <al.h>
#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 <al.h>
namespace Magnum { namespace Audio {
/* Verify types */

10
src/Magnum/Audio/Buffer.h

@ -32,9 +32,6 @@
#include <climits>
#include <utility>
#include <al.h>
#include <alc.h>
#include "MagnumExternal/OpenAL/extensions.h"
#include <Corrade/Containers/ArrayView.h>
@ -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 <al.h>
#include <alc.h>
#include "MagnumExternal/OpenAL/extensions.h"
namespace Magnum { namespace Audio {
/** @brief Sample buffer */

9
src/Magnum/Audio/BufferFormat.h

@ -29,12 +29,15 @@
* @brief Enum @ref Magnum::Audio::BufferFormat
*/
#include <al.h>
#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 <al.h>
#include "MagnumExternal/OpenAL/extensions.h"
namespace Magnum { namespace Audio {
/**

2
src/Magnum/Audio/Context.cpp

@ -27,8 +27,6 @@
#include "Context.h"
#include <al.h>
#include <alc.h>
#include <cstring>
#include <algorithm>
#include <Corrade/Utility/Arguments.h>

8
src/Magnum/Audio/Context.h

@ -35,8 +35,6 @@
#include <string>
#include <vector>
#include <bitset>
#include <al.h>
#include <alc.h>
#include <Corrade/Containers/EnumSet.h>
#include <Corrade/Utility/Debug.h>
@ -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 <al.h>
#include <alc.h>
#include "MagnumExternal/OpenAL/extensions.h"
namespace Magnum { namespace Audio {

6
src/Magnum/Audio/Renderer.h

@ -30,13 +30,17 @@
*/
#include <array>
#include <al.h>
#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 <al.h>
namespace Magnum { namespace Audio {
/** @brief Global renderer configuration */

6
src/Magnum/Audio/Source.h

@ -33,7 +33,6 @@
#include <functional>
#include <initializer_list>
#include <vector>
#include <al.h>
#include <Corrade/Containers/Containers.h>
@ -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 <al.h>
namespace Magnum { namespace Audio {
/**

5
src/MagnumExternal/OpenAL/extensions.h vendored

@ -27,6 +27,11 @@
DEALINGS IN THE SOFTWARE.
*/
#include <Corrade/configure.h>
#if defined(CORRADE_TARGET_APPLE) && !defined(OPENAL_DEPRECATED)
#define OPENAL_DEPRECATED /* Override deprecation warning macro to nothing */
#endif
#include <al.h>
#include <alc.h>

Loading…
Cancel
Save