From 591ba30a0051c856c8b877b8687f071e0212e28c Mon Sep 17 00:00:00 2001 From: Didier 'OdyX' Raboud Date: Wed, 23 Oct 2013 10:02:41 +0200 Subject: Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script --- CMakeLists.txt | 1 + src/sound/oalsound/alsound.h | 2 +- src/sound/oalsound/buffer.h | 2 +- src/sound/oalsound/channel.h | 4 ++-- src/sound/oalsound/check.h | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 496cd63..949653e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,6 +175,7 @@ find_package(GLEW REQUIRED) if (OPENAL_SOUND) find_package(OpenAL REQUIRED) + include_directories(${OPENAL_INCLUDE_DIR}) find_package(LibSndFile REQUIRED) endif() diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h index ad32204..cd44ae9 100644 --- a/src/sound/oalsound/alsound.h +++ b/src/sound/oalsound/alsound.h @@ -32,7 +32,7 @@ #include #include -#include +#include class ALSound : public CSoundInterface diff --git a/src/sound/oalsound/buffer.h b/src/sound/oalsound/buffer.h index d847426..e693d75 100644 --- a/src/sound/oalsound/buffer.h +++ b/src/sound/oalsound/buffer.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include class Buffer diff --git a/src/sound/oalsound/channel.h b/src/sound/oalsound/channel.h index a04b509..2930f26 100644 --- a/src/sound/oalsound/channel.h +++ b/src/sound/oalsound/channel.h @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include struct SoundOper { diff --git a/src/sound/oalsound/check.h b/src/sound/oalsound/check.h index f677e17..b8f67c0 100644 --- a/src/sound/oalsound/check.h +++ b/src/sound/oalsound/check.h @@ -18,11 +18,11 @@ #pragma once -#include -#include - #include "common/logger.h" +#include +#include + static ALenum CODE = AL_NO_ERROR; inline bool alCheck() -- cgit v1.2.3-1-g7c22