From f6638a173e21fbee3cc961d3dea82cc89382b873 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Wed, 26 Sep 2012 22:57:43 +0200 Subject: Work in progress on opening files, and listing dirs Fixed includes profile changed from SimpleIni to boost::ptree -> not finished yet --- src/sound/plugins/oalsound/CMakeLists.txt | 2 +- src/sound/plugins/oalsound/alsound.h | 6 +++--- src/sound/plugins/oalsound/buffer.h | 4 ++-- src/sound/plugins/oalsound/channel.h | 2 +- src/sound/plugins/oalsound/check.h | 2 +- src/sound/sound.h | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/sound') diff --git a/src/sound/plugins/oalsound/CMakeLists.txt b/src/sound/plugins/oalsound/CMakeLists.txt index e36f3ac..12ab5e3 100644 --- a/src/sound/plugins/oalsound/CMakeLists.txt +++ b/src/sound/plugins/oalsound/CMakeLists.txt @@ -4,6 +4,7 @@ set(SOURCES alsound.cpp buffer.cpp channel.cpp + logger.cpp ) SET (CMAKE_CXX_FLAGS "-Wall -g -std=c++0x -fPIC") @@ -17,7 +18,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 -#include -#include -#include +#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 -#include -#include +#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 #include -#include +#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 #include -#include +#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 +#include "math/vector.h" -#include -#include +#include "common/iman.h" +#include "common/logger.h" -#include +#include "plugins/plugininterface.h" #include #include -- cgit v1.2.3-1-g7c22