* Remove directory prefixes (../Headers/ | ../includes/ ) from all *.h/*.cpp files this is now correctly handled by CMake

This commit is contained in:
Murat Suri 2011-06-05 19:23:53 +00:00
parent dfcf4d5f62
commit 456fe37358
55 changed files with 172 additions and 173 deletions

View File

@ -15,11 +15,11 @@ include(cAudio_src_files.cmake)
add_library(cAudio ${CAUDIO_LIB_TYPE} ${file_root})
if(CAUDIO_ENABLE_OGG)
include_directories (include ${CMAKE_BINARY_DIR}/include ${OPENAL_INCLUDE_DIRS} ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
include_directories (include Headers ${CMAKE_BINARY_DIR}/include ${OPENAL_INCLUDE_DIRS} ${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
target_link_libraries(cAudio Vorbis Ogg ${OPENAL_LIBRARIES})
add_dependencies(cAudio Vorbis Ogg)
else()
include_directories (include ${CMAKE_BINARY_DIR}/include ${OPENAL_INCLUDE_DIRS})
include_directories (include Headers ${CMAKE_BINARY_DIR}/include ${OPENAL_INCLUDE_DIRS})
target_link_libraries(cAudio ${OPENAL_LIBRARIES})
endif()

View File

@ -4,14 +4,14 @@
#pragma once
#include "../include/IAudioCapture.h"
#include <al.h>
#include <alc.h>
#include "../Headers/cMutex.h"
#include "../Headers/cMemoryOverride.h"
#include "../include/cSTLAllocator.h"
#include "../include/cAudioString.h"
#include "../include/IThread.h"
#include "cMutex.h"
#include "cMemoryOverride.h"
#include "IAudioCapture.h"
#include "cSTLAllocator.h"
#include "cAudioString.h"
#include "IThread.h"
namespace cAudio
{

View File

@ -8,11 +8,11 @@
#if CAUDIO_EFX_ENABLED == 1
#include "../include/IAudioEffects.h"
#include "../include/cSTLAllocator.h"
#include "../Headers/cMutex.h"
#include "../Headers/cEFXFunctions.h"
#include "../include/cAudioString.h"
#include "cMutex.h"
#include "cEFXFunctions.h"
#include "IAudioEffects.h"
#include "cSTLAllocator.h"
#include "cAudioString.h"
namespace cAudio
{

View File

@ -5,15 +5,15 @@
#pragma once
#include "cAudioSource.h"
#include "../include/IAudioDecoderFactory.h"
#include "cListener.h"
#include "../include/IAudioManager.h"
#include "../Headers/cMutex.h"
#include "../Headers/cAudioEffects.h"
#include "../Headers/cMemoryOverride.h"
#include "../include/cSTLAllocator.h"
#include "../include/cAudioString.h"
#include "../include/IThread.h"
#include "cMutex.h"
#include "cAudioEffects.h"
#include "cMemoryOverride.h"
#include "IAudioDecoderFactory.h"
#include "IAudioManager.h"
#include "cSTLAllocator.h"
#include "cAudioString.h"
#include "IThread.h"
#include <al.h>
#include <alc.h>

View File

@ -10,13 +10,13 @@
#include <al.h>
#include <alc.h>
#include "../include/IAudioSource.h"
#include "../include/cVector3.h"
#include "../Headers/cMutex.h"
#include "../include/ILogger.h"
#include "../Headers/cEFXFunctions.h"
#include "../Headers/cMemoryOverride.h"
#include "../include/cSTLAllocator.h"
#include "cMutex.h"
#include "cEFXFunctions.h"
#include "cMemoryOverride.h"
#include "IAudioSource.h"
#include "cVector3.h"
#include "ILogger.h"
#include "cSTLAllocator.h"
namespace cAudio
{

View File

@ -4,8 +4,8 @@
#pragma once
#include "../include/ILogReceiver.h"
#include "../include/cAudioDefines.h"
#include "ILogReceiver.h"
#include "cAudioDefines.h"
#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1
namespace cAudio

View File

@ -4,7 +4,7 @@
#pragma once
#include "../include/cAudioDefines.h"
#include "cAudioDefines.h"
#if CAUDIO_EFX_ENABLED == 1
@ -13,7 +13,7 @@
#include <efx.h>
#include <efx-creative.h>
#include "../Headers/cMutex.h"
#include "cMutex.h"
//To use EFX in linux.
#ifndef ALC_EXT_EFX

View File

@ -8,13 +8,12 @@
#if CAUDIO_EFX_ENABLED == 1
#include "../include/IEffect.h"
#include "../Headers/cMutex.h"
#include "../Headers/cEFXFunctions.h"
#include "../Headers/cMemoryOverride.h"
#include <al.h>
#include <alc.h>
#include "cMutex.h"
#include "cEFXFunctions.h"
#include "cMemoryOverride.h"
#include "IEffect.h"
namespace cAudio
{

View File

@ -4,8 +4,8 @@
#pragma once
#include "../include/ILogReceiver.h"
#include "../include/cAudioDefines.h"
#include "ILogReceiver.h"
#include "cAudioDefines.h"
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
namespace cAudio

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/IDataSource.h"
#include "../include/cAudioDefines.h"
#include "../Headers/cMemoryOverride.h"
#include "IDataSource.h"
#include "cAudioDefines.h"
#include "cMemoryOverride.h"
#if CAUDIO_COMPILE_WITH_FILE_SOURCE == 1

View File

@ -4,13 +4,13 @@
#pragma once
#include "../include/IDataSourceFactory.h"
#include "IDataSourceFactory.h"
#if CAUDIO_COMPILE_WITH_FILE_SOURCE == 1
#include "../Headers/cFileSource.h"
#include "../Headers/cMemorySource.h"
#include "../Headers/cMutex.h"
#include "cFileSource.h"
#include "cMemorySource.h"
#include "cMutex.h"
namespace cAudio
{

View File

@ -8,10 +8,10 @@
#if CAUDIO_EFX_ENABLED == 1
#include "../include/IFilter.h"
#include "../Headers/cMutex.h"
#include "../Headers/cEFXFunctions.h"
#include "../Headers/cMemoryOverride.h"
#include "IFilter.h"
#include "cMutex.h"
#include "cEFXFunctions.h"
#include "cMemoryOverride.h"
#include <al.h>
#include <alc.h>

View File

@ -4,8 +4,8 @@
#pragma once
#include "../include/IListener.h"
#include "../Headers/cMutex.h"
#include "IListener.h"
#include "cMutex.h"
namespace cAudio
{

View File

@ -5,11 +5,10 @@
#pragma once
#include <stdarg.h>
#include "../include/ILogger.h"
#include "../Headers/cMutex.h"
#include "../include/cSTLAllocator.h"
#include "../include/cAudioString.h"
#include "cMutex.h"
#include "ILogger.h"
#include "cSTLAllocator.h"
#include "cAudioString.h"
namespace cAudio
{

View File

@ -5,7 +5,7 @@
#pragma once
#include <new>
#include "../include/cAudioMemory.h"
#include "cAudioMemory.h"
namespace cAudio
{

View File

@ -4,8 +4,8 @@
#pragma once
#include "../include/IDataSource.h"
#include "../Headers/cMemoryOverride.h"
#include "IDataSource.h"
#include "cMemoryOverride.h"
namespace cAudio
{

View File

@ -4,12 +4,12 @@
#pragma once
#include "../include/cAudioDefines.h"
#include "cAudioDefines.h"
#if CAUDIO_USE_MEMORYTRACKER == 1
#include <map>
#include "../Headers/cMutex.h"
#include "cMutex.h"
#include <iostream>
#include <fstream>

View File

@ -4,7 +4,7 @@
#pragma once
#include "../include/cAudioDefines.h"
#include "cAudioDefines.h"
#if CAUDIO_MAKE_THREAD_SAFE == 1
#ifdef CAUDIO_PLATFORM_WIN

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/IAudioDecoderFactory.h"
#include "IAudioDecoderFactory.h"
#include "cOggDecoder.h"
#include "../Headers/cMutex.h"
#include "cMutex.h"
#if CAUDIO_COMPILE_WITH_OGG_DECODER == 1

View File

@ -4,15 +4,15 @@
#pragma once
#include "../include/cAudioDefines.h"
#include "cAudioDefines.h"
#if CAUDIO_COMPILE_WITH_OGG_DECODER == 1
#include "../include/IAudioDecoder.h"
#include "IAudioDecoder.h"
#include <ogg/ogg.h>
#include <vorbis/codec.h>
#include <vorbis/vorbisfile.h>
#include "../Headers/cMemoryOverride.h"
#include "cMemoryOverride.h"
namespace cAudio
{

View File

@ -4,8 +4,8 @@
#pragma once
#include "../include/IAudioDeviceList.h"
#include "../Headers/cMemoryOverride.h"
#include "IAudioDeviceList.h"
#include "cMemoryOverride.h"
namespace cAudio
{

View File

@ -4,11 +4,11 @@
#pragma once
#include "../include/IPluginManager.h"
#include "../include/IAudioPlugin.h"
#include "../Headers/cMutex.h"
#include "../include/cSTLAllocator.h"
#include "../include/cAudioString.h"
#include "cMutex.h"
#include "IPluginManager.h"
#include "IAudioPlugin.h"
#include "cSTLAllocator.h"
#include "cAudioString.h"
#ifdef CAUDIO_COMPILE_WITH_PLUGIN_SUPPORT

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/IAudioDecoderFactory.h"
#include "cMutex.h"
#include "cRawDecoder.h"
#include "../Headers/cMutex.h"
#include "IAudioDecoderFactory.h"
namespace cAudio
{

View File

@ -4,8 +4,8 @@
#pragma once
#include "../include/IAudioDecoder.h"
#include "../Headers/cMemoryOverride.h"
#include "IAudioDecoder.h"
#include "cMemoryOverride.h"
namespace cAudio
{

View File

@ -4,8 +4,9 @@
#pragma once
#include "../include/IMemoryProvider.h"
#include "IMemoryProvider.h"
#include <cstring>
namespace cAudio
{
//! Memory provider that wraps the standard memalloc and free

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/cAudioDefines.h"
#include "../Include/IThread.h"
#include "../Headers/cMutex.h"
#include "cMutex.h"
#include "cAudioDefines.h"
#include "IThread.h"
#ifdef CAUDIO_PLATFORM_WIN
#include <windows.h> //Basic windows includes

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/cAudioPlatform.h"
#include "../include/cSTLAllocator.h"
#include "../include/cAudioString.h"
#include "cAudioPlatform.h"
#include "cSTLAllocator.h"
#include "cAudioString.h"
#ifdef CAUDIO_PLATFORM_WIN
# define WIN32_LEAN_AND_MEAN

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/IAudioDecoderFactory.h"
#include "cMutex.h"
#include "cWavDecoder.h"
#include "../Headers/cMutex.h"
#include "IAudioDecoderFactory.h"
#if CAUDIO_COMPILE_WITH_WAV_DECODER == 1

View File

@ -4,9 +4,9 @@
#pragma once
#include "../include/IAudioDecoder.h"
#include "../include/cAudioDefines.h"
#include "../Headers/cMemoryOverride.h"
#include "cMemoryOverride.h"
#include "IAudioDecoder.h"
#include "cAudioDefines.h"
#if CAUDIO_COMPILE_WITH_WAV_DECODER == 1

View File

@ -2,30 +2,30 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Include/cAudio.h"
#include "../Headers/cAudioManager.h"
#include "../Headers/cAudioCapture.h"
#include "cAudio.h"
#include "cAudioManager.h"
#include "cAudioCapture.h"
#if CAUDIO_COMPILE_WITH_OGG_DECODER == 1
#include "../Headers/cOggAudioDecoderFactory.h"
#include "cOggAudioDecoderFactory.h"
#endif
#if CAUDIO_COMPILE_WITH_WAV_DECODER == 1
#include "../Headers/cWavAudioDecoderFactory.h"
#include "cWavAudioDecoderFactory.h"
#endif
#include "../Headers/cRawAudioDecoderFactory.h"
#include "cRawAudioDecoderFactory.h"
#if CAUDIO_COMPILE_WITH_FILE_SOURCE == 1
#include "../Headers/cFileSourceFactory.h"
#include "../Headers/cFileSource.h"
#include "cFileSourceFactory.h"
#include "cFileSource.h"
#endif
#include "../Headers/cPluginManager.h"
#include "../Headers/cLogger.h"
#include "../Headers/cConsoleLogReceiver.h"
#include "../Headers/cFileLogReceiver.h"
#include "../Headers/cOpenALAudioDeviceList.h"
#include "cPluginManager.h"
#include "cLogger.h"
#include "cConsoleLogReceiver.h"
#include "cFileLogReceiver.h"
#include "cOpenALAudioDeviceList.h"
namespace cAudio
{

View File

@ -2,13 +2,13 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../include/cAudio.h"
#include "../Headers/cAudioCapture.h"
#include "../Headers/cUtils.h"
#include "../Headers/cThread.h"
#include "../include/cAudioSleep.h"
#include "../Headers/cLogger.h"
#include "../Headers/cPluginManager.h"
#include "cAudio.h"
#include "cAudioCapture.h"
#include "cUtils.h"
#include "cThread.h"
#include "cAudioSleep.h"
#include "cLogger.h"
#include "cPluginManager.h"
#include <string.h>

View File

@ -2,10 +2,10 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cAudioEffects.h"
#include "../Headers/cFilter.h"
#include "../Headers/cEffect.h"
#include "../Headers/cUtils.h"
#include "cAudioEffects.h"
#include "cFilter.h"
#include "cEffect.h"
#include "cUtils.h"
#if CAUDIO_EFX_ENABLED == 1

View File

@ -2,17 +2,17 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cAudioManager.h"
#include "../include/cAudio.h"
#include "../include/cAudioPlatform.h"
#include "../include/cAudioSleep.h"
#include "../Headers/cUtils.h"
#include "../Headers/cThread.h"
#include "../Headers/cLogger.h"
#include "../Headers/cPluginManager.h"
#include "../Headers/cThread.h"
#include "../Headers/cMemorySource.h"
#include "../Headers/cRawAudioDecoderFactory.h"
#include "cAudioManager.h"
#include "cAudio.h"
#include "cAudioPlatform.h"
#include "cAudioSleep.h"
#include "cUtils.h"
#include "cThread.h"
#include "cLogger.h"
#include "cPluginManager.h"
#include "cThread.h"
#include "cMemorySource.h"
#include "cRawAudioDecoderFactory.h"
#include <string.h>
#include <algorithm>

View File

@ -2,8 +2,8 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../include/cAudioMemory.h"
#include "../Headers/cStandardMemoryProvider.h"
#include "cAudioMemory.h"
#include "cStandardMemoryProvider.h"
namespace cAudio
{

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../include/cAudioPlatform.h"
#include "cAudioPlatform.h"
#ifdef CAUDIO_PLATFORM_WIN
#include <windows.h> //Basic windows include for Sleep();
@ -11,7 +11,7 @@
#include <time.h>
#endif //If you need to support another platform, simply add a define for it
#include "../include/cAudioSleep.h"
#include "cAudioSleep.h"
namespace cAudio
{

View File

@ -2,12 +2,12 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cAudioSource.h"
#include "../include/cAudio.h"
#include "../Headers/cLogger.h"
#include "../Headers/cFilter.h"
#include "../Headers/cEffect.h"
#include "../include/cAudioSleep.h"
#include "cAudioSource.h"
#include "cAudio.h"
#include "cLogger.h"
#include "cFilter.h"
#include "cEffect.h"
#include "cAudioSleep.h"
#include <string.h>

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cConsoleLogReceiver.h"
#include "cConsoleLogReceiver.h"
#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1
#include <iostream>

View File

@ -2,10 +2,10 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cEffect.h"
#include "../Headers/cLogger.h"
#include "../Headers/cUtils.h"
#include "../include/cAudio.h"
#include "cEffect.h"
#include "cLogger.h"
#include "cUtils.h"
#include "cAudio.h"
#if CAUDIO_EFX_ENABLED == 1

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cFileLogReceiver.h"
#include "cFileLogReceiver.h"
#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1
#include <iostream>

View File

@ -2,8 +2,8 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cFileSource.h"
#include "../Headers/cUtils.h"
#include "cFileSource.h"
#include "cUtils.h"
#if CAUDIO_COMPILE_WITH_FILE_SOURCE == 1

View File

@ -2,10 +2,10 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cFilter.h"
#include "../Headers/cLogger.h"
#include "../Headers/cUtils.h"
#include "../include/cAudio.h"
#include "cFilter.h"
#include "cLogger.h"
#include "cUtils.h"
#include "cAudio.h"
#if CAUDIO_EFX_ENABLED == 1

View File

@ -2,8 +2,8 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cListener.h"
#include "../Headers/cEFXFunctions.h"
#include "cListener.h"
#include "cEFXFunctions.h"
#include <al.h>
namespace cAudio

View File

@ -4,10 +4,10 @@
#include <time.h>
#include <stdio.h>
#include "../Headers/cLogger.h"
#include "../Headers/cConsoleLogReceiver.h"
#include "../Headers/cFileLogReceiver.h"
#include "../Headers/cUtils.h"
#include "cLogger.h"
#include "cConsoleLogReceiver.h"
#include "cFileLogReceiver.h"
#include "cUtils.h"
namespace cAudio
{

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cMemorySource.h"
#include "cMemorySource.h"
#include <cstring>

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cMemoryTracker.h"
#include "cMemoryTracker.h"
#if CAUDIO_USE_MEMORYTRACKER == 1

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cMutex.h"
#include "cMutex.h"
namespace cAudio
{

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cOggAudioDecoderFactory.h"
#include "cOggAudioDecoderFactory.h"

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cOggDecoder.h"
#include "cOggDecoder.h"
#if CAUDIO_COMPILE_WITH_OGG_DECODER == 1

View File

@ -4,7 +4,7 @@
#pragma once
#include "../Headers/cOpenALAudioDeviceList.h"
#include "cOpenALAudioDeviceList.h"
#include <al.h>
#include <alc.h>

View File

@ -2,12 +2,12 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cPluginManager.h"
#include "../Headers/cUtils.h"
#include "../include/cAudioPlatform.h"
#include "../include/cAudioDefines.h"
#include "../include/ILogger.h"
#include "../include/cAudio.h"
#include "cPluginManager.h"
#include "cUtils.h"
#include "cAudioPlatform.h"
#include "cAudioDefines.h"
#include "ILogger.h"
#include "cAudio.h"
#ifdef CAUDIO_COMPILE_WITH_PLUGIN_SUPPORT

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cRawDecoder.h"
#include "cRawDecoder.h"
namespace cAudio{

View File

@ -2,8 +2,8 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cStandardMemoryProvider.h"
#include "../Headers/cMemoryTracker.h"
#include "cStandardMemoryProvider.h"
#include "cMemoryTracker.h"
#include <stdlib.h>
#include <limits>

View File

@ -2,8 +2,8 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cThread.h"
#include "../Include/cAudioSleep.h"
#include "cThread.h"
#include "cAudioSleep.h"
namespace cAudio
{

View File

@ -2,4 +2,4 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cWavAudioDecoderFactory.h"
#include "cWavAudioDecoderFactory.h"

View File

@ -2,7 +2,7 @@
// This file is part of the "cAudio Engine"
// For conditions of distribution and use, see copyright notice in cAudio.h
#include "../Headers/cWavDecoder.h"
#include "cWavDecoder.h"
#include <string.h>
#if CAUDIO_COMPILE_WITH_WAV_DECODER == 1