immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script

dev-ui
Didier 'OdyX' Raboud 2013-10-23 10:02:41 +02:00 committed by Piotr Dziwinski
parent b3b6a40d9e
commit 591ba30a00
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -175,6 +175,7 @@ find_package(GLEW REQUIRED)
if (OPENAL_SOUND) if (OPENAL_SOUND)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
include_directories(${OPENAL_INCLUDE_DIR})
find_package(LibSndFile REQUIRED) find_package(LibSndFile REQUIRED)
endif() endif()

2
src/sound/oalsound/alsound.h
View File

@ -32,7 +32,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include <AL/al.h> #include <al.h>
class ALSound : public CSoundInterface class ALSound : public CSoundInterface

2
src/sound/oalsound/buffer.h
View File

@ -30,7 +30,7 @@
#include <vector> #include <vector>
#include <array> #include <array>
#include <AL/al.h> #include <al.h>
#include <sndfile.h> #include <sndfile.h>
class Buffer class Buffer

4
src/sound/oalsound/channel.h
View File

@ -30,8 +30,8 @@
#include <deque> #include <deque>
#include <cassert> #include <cassert>
#include <AL/al.h> #include <al.h>
#include <AL/alc.h> #include <alc.h>
struct SoundOper struct SoundOper
{ {

6
src/sound/oalsound/check.h
View File

@ -18,11 +18,11 @@
#pragma once #pragma once
#include <AL/al.h>
#include <AL/alc.h>
#include "common/logger.h" #include "common/logger.h"
#include <al.h>
#include <alc.h>
static ALenum CODE = AL_NO_ERROR; static ALenum CODE = AL_NO_ERROR;
inline bool alCheck() inline bool alCheck()