diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-29 12:19:00 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-29 12:19:00 +0200 |
| commit | e9660c47c69327a131c4e4b15bea4bdc7937fd61 (patch) | |
| tree | c7edc252258b6149ad09fcf9ba609f1d8cb92ae0 /src/sound | |
| parent | 677ce3960cd13cbf994311c76d75b343b22fd480 (diff) | |
| parent | df4e3dfb6e623889757afe79fc4dfd29ae85748e (diff) | |
| download | colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.tar.gz colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.tar.bz2 colobot-e9660c47c69327a131c4e4b15bea4bdc7937fd61.zip | |
Merge branch 'dev' into dev-graphics
Diffstat (limited to 'src/sound')
| -rw-r--r-- | src/sound/plugins/oalsound/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/sound/plugins/oalsound/alsound.h | 6 | ||||
| -rw-r--r-- | src/sound/plugins/oalsound/buffer.h | 4 | ||||
| -rw-r--r-- | src/sound/plugins/oalsound/channel.h | 2 | ||||
| -rw-r--r-- | src/sound/plugins/oalsound/check.h | 2 | ||||
| -rw-r--r-- | src/sound/sound.h | 8 |
6 files changed, 11 insertions, 12 deletions
diff --git a/src/sound/plugins/oalsound/CMakeLists.txt b/src/sound/plugins/oalsound/CMakeLists.txt index e36f3ac..0bc9482 100644 --- a/src/sound/plugins/oalsound/CMakeLists.txt +++ b/src/sound/plugins/oalsound/CMakeLists.txt @@ -17,7 +17,6 @@ set(OPENAL_LIBRARIES alut ) - include_directories(../../..) include_directories(.) add_library(openalsound SHARED ${SOURCES}) diff --git a/src/sound/plugins/oalsound/alsound.h b/src/sound/plugins/oalsound/alsound.h index 01ccc71..a1128e0 100644 --- a/src/sound/plugins/oalsound/alsound.h +++ b/src/sound/plugins/oalsound/alsound.h @@ -24,9 +24,9 @@ #include <AL/alut.h> -#include <common/iman.h> -#include <common/logger.h> -#include <sound/sound.h> +#include "common/iman.h" +#include "common/logger.h" +#include "sound/sound.h" #include "buffer.h" #include "channel.h" diff --git a/src/sound/plugins/oalsound/buffer.h b/src/sound/plugins/oalsound/buffer.h index 6eefe72..8c4a2d3 100644 --- a/src/sound/plugins/oalsound/buffer.h +++ b/src/sound/plugins/oalsound/buffer.h @@ -22,8 +22,8 @@ #include <AL/alut.h> -#include <sound/sound.h> -#include <common/logger.h> +#include "sound/sound.h" +#include "common/logger.h" #include "check.h" diff --git a/src/sound/plugins/oalsound/channel.h b/src/sound/plugins/oalsound/channel.h index 3099931..165ff50 100644 --- a/src/sound/plugins/oalsound/channel.h +++ b/src/sound/plugins/oalsound/channel.h @@ -25,7 +25,7 @@ #include <AL/al.h> #include <AL/alc.h> -#include <sound/sound.h> +#include "sound/sound.h" #include "buffer.h" #include "check.h" diff --git a/src/sound/plugins/oalsound/check.h b/src/sound/plugins/oalsound/check.h index cb6b4a1..cf3e468 100644 --- a/src/sound/plugins/oalsound/check.h +++ b/src/sound/plugins/oalsound/check.h @@ -21,7 +21,7 @@ #include <AL/al.h> #include <AL/alc.h> -#include <common/logger.h> +#include "common/logger.h" static ALenum CODE = AL_NO_ERROR; diff --git a/src/sound/sound.h b/src/sound/sound.h index 11138c3..1f3fea9 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -24,12 +24,12 @@ #pragma once -#include <math/vector.h> +#include "math/vector.h" -#include <common/iman.h> -#include <common/logger.h> +#include "common/iman.h" +#include "common/logger.h" -#include <plugins/plugininterface.h> +#include "plugins/plugininterface.h" #include <string> #include <iostream> |