sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate NAZARA_API into multiple defines (one per module)

Browse Source 
To fix inter-module dependency


Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0
This commit is contained in:
Lynix
2015-06-13 22:31:29 +02:00
parent 251e21f006
commit 1fc17c8b53
196 changed files with 680 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Audio/Audio.hpp
View File

@@ -8,12 +8,13 @@
#define NAZARA_AUDIO_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Audio/Config.hpp>
#include <Nazara/Audio/Enums.hpp>
#include <Nazara/Core/Initializer.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
class NAZARA_API NzAudio
class NAZARA_AUDIO_API NzAudio
{
public:
NzAudio() = delete;

10
include/Nazara/Audio/Config.hpp
View File

@@ -41,4 +41,14 @@
/// Vérification des valeurs et types de certaines constantes
#include <Nazara/Audio/ConfigCheck.hpp>
#if !defined(NAZARA_STATIC)
#ifdef NAZARA_AUDIO_BUILD
#define NAZARA_AUDIO_API NAZARA_EXPORT
#else
#define NAZARA_AUDIO_API NAZARA_IMPORT
#endif
#else
#define NAZARA_AUDIO_API
#endif
#endif // NAZARA_CONFIG_AUDIO_HPP

2
include/Nazara/Audio/Music.hpp
View File

@@ -27,7 +27,7 @@ using NzMusicLoader = NzResourceLoader<NzMusic, NzMusicParams>;
struct NzMusicImpl;
class NAZARA_API NzMusic : public NzResource, public NzSoundEmitter, NzNonCopyable
class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter, NzNonCopyable
{
friend NzMusicLoader;

189
include/Nazara/Audio/OpenAL.hpp
View File

@@ -10,6 +10,7 @@
#ifdef NAZARA_AUDIO_OPENAL
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Audio/Config.hpp>
#include <Nazara/Audio/Enums.hpp>
#include <Nazara/Core/String.hpp>
#include <vector>
@@ -58,7 +59,7 @@ using NzOpenALDetail::ALCvoid;
using NzOpenALFunc = void (*)();
class NAZARA_API NzOpenAL
class NAZARA_AUDIO_API NzOpenAL
{
public:
static NzOpenALFunc GetEntry(const NzString& entryPoint);
@@ -86,101 +87,101 @@ class NAZARA_API NzOpenAL
};
// al
NAZARA_API extern NzOpenALDetail::LPALBUFFER3F alBuffer3f;
NAZARA_API extern NzOpenALDetail::LPALBUFFER3I alBuffer3i;
NAZARA_API extern NzOpenALDetail::LPALBUFFERDATA alBufferData;
NAZARA_API extern NzOpenALDetail::LPALBUFFERF alBufferf;
NAZARA_API extern NzOpenALDetail::LPALBUFFERFV alBufferfv;
NAZARA_API extern NzOpenALDetail::LPALBUFFERI alBufferi;
NAZARA_API extern NzOpenALDetail::LPALBUFFERIV alBufferiv;
NAZARA_API extern NzOpenALDetail::LPALDELETEBUFFERS alDeleteBuffers;
NAZARA_API extern NzOpenALDetail::LPALDELETESOURCES alDeleteSources;
NAZARA_API extern NzOpenALDetail::LPALDISABLE alDisable;
NAZARA_API extern NzOpenALDetail::LPALDISTANCEMODEL alDistanceModel;
NAZARA_API extern NzOpenALDetail::LPALDOPPLERFACTOR alDopplerFactor;
NAZARA_API extern NzOpenALDetail::LPALDOPPLERVELOCITY alDopplerVelocity;
NAZARA_API extern NzOpenALDetail::LPALENABLE alEnable;
NAZARA_API extern NzOpenALDetail::LPALGENBUFFERS alGenBuffers;
NAZARA_API extern NzOpenALDetail::LPALGENSOURCES alGenSources;
NAZARA_API extern NzOpenALDetail::LPALGETBOOLEAN alGetBoolean;
NAZARA_API extern NzOpenALDetail::LPALGETBOOLEANV alGetBooleanv;
NAZARA_API extern NzOpenALDetail::LPALGETBUFFER3F alGetBuffer3f;
NAZARA_API extern NzOpenALDetail::LPALGETBUFFER3I alGetBuffer3i;
NAZARA_API extern NzOpenALDetail::LPALGETBUFFERF alGetBufferf;
NAZARA_API extern NzOpenALDetail::LPALGETBUFFERFV alGetBufferfv;
NAZARA_API extern NzOpenALDetail::LPALGETBUFFERI alGetBufferi;
NAZARA_API extern NzOpenALDetail::LPALGETBUFFERIV alGetBufferiv;
NAZARA_API extern NzOpenALDetail::LPALGETDOUBLE alGetDouble;
NAZARA_API extern NzOpenALDetail::LPALGETDOUBLEV alGetDoublev;
NAZARA_API extern NzOpenALDetail::LPALGETENUMVALUE alGetEnumValue;
NAZARA_API extern NzOpenALDetail::LPALGETERROR alGetError;
NAZARA_API extern NzOpenALDetail::LPALGETFLOAT alGetFloat;
NAZARA_API extern NzOpenALDetail::LPALGETFLOATV alGetFloatv;
NAZARA_API extern NzOpenALDetail::LPALGETINTEGER alGetInteger;
NAZARA_API extern NzOpenALDetail::LPALGETINTEGERV alGetIntegerv;
NAZARA_API extern NzOpenALDetail::LPALGETLISTENER3F alGetListener3f;
NAZARA_API extern NzOpenALDetail::LPALGETLISTENER3I alGetListener3i;
NAZARA_API extern NzOpenALDetail::LPALGETLISTENERF alGetListenerf;
NAZARA_API extern NzOpenALDetail::LPALGETLISTENERFV alGetListenerfv;
NAZARA_API extern NzOpenALDetail::LPALGETLISTENERI alGetListeneri;
NAZARA_API extern NzOpenALDetail::LPALGETLISTENERIV alGetListeneriv;
NAZARA_API extern NzOpenALDetail::LPALGETPROCADDRESS alGetProcAddress;
NAZARA_API extern NzOpenALDetail::LPALGETSOURCE3F alGetSource3f;
NAZARA_API extern NzOpenALDetail::LPALGETSOURCE3I alGetSource3i;
NAZARA_API extern NzOpenALDetail::LPALGETSOURCEF alGetSourcef;
NAZARA_API extern NzOpenALDetail::LPALGETSOURCEFV alGetSourcefv;
NAZARA_API extern NzOpenALDetail::LPALGETSOURCEI alGetSourcei;
NAZARA_API extern NzOpenALDetail::LPALGETSOURCEIV alGetSourceiv;
NAZARA_API extern NzOpenALDetail::LPALGETSTRING alGetString;
NAZARA_API extern NzOpenALDetail::LPALISBUFFER alIsBuffer;
NAZARA_API extern NzOpenALDetail::LPALISENABLED alIsEnabled;
NAZARA_API extern NzOpenALDetail::LPALISEXTENSIONPRESENT alIsExtensionPresent;
NAZARA_API extern NzOpenALDetail::LPALISSOURCE alIsSource;
NAZARA_API extern NzOpenALDetail::LPALLISTENER3F alListener3f;
NAZARA_API extern NzOpenALDetail::LPALLISTENER3I alListener3i;
NAZARA_API extern NzOpenALDetail::LPALLISTENERF alListenerf;
NAZARA_API extern NzOpenALDetail::LPALLISTENERFV alListenerfv;
NAZARA_API extern NzOpenALDetail::LPALLISTENERI alListeneri;
NAZARA_API extern NzOpenALDetail::LPALLISTENERIV alListeneriv;
NAZARA_API extern NzOpenALDetail::LPALSOURCE3F alSource3f;
NAZARA_API extern NzOpenALDetail::LPALSOURCE3I alSource3i;
NAZARA_API extern NzOpenALDetail::LPALSOURCEF alSourcef;
NAZARA_API extern NzOpenALDetail::LPALSOURCEFV alSourcefv;
NAZARA_API extern NzOpenALDetail::LPALSOURCEI alSourcei;
NAZARA_API extern NzOpenALDetail::LPALSOURCEIV alSourceiv;
NAZARA_API extern NzOpenALDetail::LPALSOURCEPAUSE alSourcePause;
NAZARA_API extern NzOpenALDetail::LPALSOURCEPAUSEV alSourcePausev;
NAZARA_API extern NzOpenALDetail::LPALSOURCEPLAY alSourcePlay;
NAZARA_API extern NzOpenALDetail::LPALSOURCEPLAYV alSourcePlayv;
NAZARA_API extern NzOpenALDetail::LPALSOURCEQUEUEBUFFERS alSourceQueueBuffers;
NAZARA_API extern NzOpenALDetail::LPALSOURCEREWIND alSourceRewind;
NAZARA_API extern NzOpenALDetail::LPALSOURCEREWINDV alSourceRewindv;
NAZARA_API extern NzOpenALDetail::LPALSOURCESTOP alSourceStop;
NAZARA_API extern NzOpenALDetail::LPALSOURCESTOPV alSourceStopv;
NAZARA_API extern NzOpenALDetail::LPALSOURCEUNQUEUEBUFFERS alSourceUnqueueBuffers;
NAZARA_API extern NzOpenALDetail::LPALSPEEDOFSOUND alSpeedOfSound;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFER3F alBuffer3f;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFER3I alBuffer3i;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFERDATA alBufferData;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFERF alBufferf;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFERFV alBufferfv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFERI alBufferi;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALBUFFERIV alBufferiv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALDELETEBUFFERS alDeleteBuffers;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALDELETESOURCES alDeleteSources;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALDISABLE alDisable;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALDISTANCEMODEL alDistanceModel;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALDOPPLERFACTOR alDopplerFactor;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALDOPPLERVELOCITY alDopplerVelocity;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALENABLE alEnable;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGENBUFFERS alGenBuffers;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGENSOURCES alGenSources;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBOOLEAN alGetBoolean;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBOOLEANV alGetBooleanv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBUFFER3F alGetBuffer3f;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBUFFER3I alGetBuffer3i;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBUFFERF alGetBufferf;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBUFFERFV alGetBufferfv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBUFFERI alGetBufferi;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETBUFFERIV alGetBufferiv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETDOUBLE alGetDouble;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETDOUBLEV alGetDoublev;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETENUMVALUE alGetEnumValue;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETERROR alGetError;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETFLOAT alGetFloat;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETFLOATV alGetFloatv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETINTEGER alGetInteger;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETINTEGERV alGetIntegerv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETLISTENER3F alGetListener3f;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETLISTENER3I alGetListener3i;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETLISTENERF alGetListenerf;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETLISTENERFV alGetListenerfv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETLISTENERI alGetListeneri;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETLISTENERIV alGetListeneriv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETPROCADDRESS alGetProcAddress;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSOURCE3F alGetSource3f;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSOURCE3I alGetSource3i;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSOURCEF alGetSourcef;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSOURCEFV alGetSourcefv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSOURCEI alGetSourcei;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSOURCEIV alGetSourceiv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALGETSTRING alGetString;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALISBUFFER alIsBuffer;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALISENABLED alIsEnabled;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALISEXTENSIONPRESENT alIsExtensionPresent;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALISSOURCE alIsSource;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALLISTENER3F alListener3f;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALLISTENER3I alListener3i;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALLISTENERF alListenerf;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALLISTENERFV alListenerfv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALLISTENERI alListeneri;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALLISTENERIV alListeneriv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCE3F alSource3f;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCE3I alSource3i;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEF alSourcef;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEFV alSourcefv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEI alSourcei;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEIV alSourceiv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEPAUSE alSourcePause;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEPAUSEV alSourcePausev;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEPLAY alSourcePlay;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEPLAYV alSourcePlayv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEQUEUEBUFFERS alSourceQueueBuffers;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEREWIND alSourceRewind;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEREWINDV alSourceRewindv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCESTOP alSourceStop;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCESTOPV alSourceStopv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSOURCEUNQUEUEBUFFERS alSourceUnqueueBuffers;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALSPEEDOFSOUND alSpeedOfSound;
// alc
NAZARA_API extern NzOpenALDetail::LPALCCAPTURECLOSEDEVICE alcCaptureCloseDevice;
NAZARA_API extern NzOpenALDetail::LPALCCAPTUREOPENDEVICE alcCaptureOpenDevice;
NAZARA_API extern NzOpenALDetail::LPALCCAPTURESAMPLES alcCaptureSamples;
NAZARA_API extern NzOpenALDetail::LPALCCAPTURESTART alcCaptureStart;
NAZARA_API extern NzOpenALDetail::LPALCCAPTURESTOP alcCaptureStop;
NAZARA_API extern NzOpenALDetail::LPALCCLOSEDEVICE alcCloseDevice;
NAZARA_API extern NzOpenALDetail::LPALCCREATECONTEXT alcCreateContext;
NAZARA_API extern NzOpenALDetail::LPALCDESTROYCONTEXT alcDestroyContext;
NAZARA_API extern NzOpenALDetail::LPALCGETCONTEXTSDEVICE alcGetContextsDevice;
NAZARA_API extern NzOpenALDetail::LPALCGETCURRENTCONTEXT alcGetCurrentContext;
NAZARA_API extern NzOpenALDetail::LPALCGETENUMVALUE alcGetEnumValue;
NAZARA_API extern NzOpenALDetail::LPALCGETERROR alcGetError;
NAZARA_API extern NzOpenALDetail::LPALCGETINTEGERV alcGetIntegerv;
NAZARA_API extern NzOpenALDetail::LPALCGETPROCADDRESS alcGetProcAddress;
NAZARA_API extern NzOpenALDetail::LPALCGETSTRING alcGetString;
NAZARA_API extern NzOpenALDetail::LPALCISEXTENSIONPRESENT alcIsExtensionPresent;
NAZARA_API extern NzOpenALDetail::LPALCMAKECONTEXTCURRENT alcMakeContextCurrent;
NAZARA_API extern NzOpenALDetail::LPALCOPENDEVICE alcOpenDevice;
NAZARA_API extern NzOpenALDetail::LPALCPROCESSCONTEXT alcProcessContext;
NAZARA_API extern NzOpenALDetail::LPALCSUSPENDCONTEXT alcSuspendContext;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCAPTURECLOSEDEVICE alcCaptureCloseDevice;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCAPTUREOPENDEVICE alcCaptureOpenDevice;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCAPTURESAMPLES alcCaptureSamples;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCAPTURESTART alcCaptureStart;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCAPTURESTOP alcCaptureStop;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCLOSEDEVICE alcCloseDevice;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCCREATECONTEXT alcCreateContext;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCDESTROYCONTEXT alcDestroyContext;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETCONTEXTSDEVICE alcGetContextsDevice;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETCURRENTCONTEXT alcGetCurrentContext;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETENUMVALUE alcGetEnumValue;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETERROR alcGetError;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETINTEGERV alcGetIntegerv;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETPROCADDRESS alcGetProcAddress;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCGETSTRING alcGetString;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCISEXTENSIONPRESENT alcIsExtensionPresent;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCMAKECONTEXTCURRENT alcMakeContextCurrent;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCOPENDEVICE alcOpenDevice;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCPROCESSCONTEXT alcProcessContext;
NAZARA_AUDIO_API extern NzOpenALDetail::LPALCSUSPENDCONTEXT alcSuspendContext;
#endif // NAZARA_AUDIO_OPENAL

2
include/Nazara/Audio/Sound.hpp
View File

@@ -12,7 +12,7 @@
#include <Nazara/Audio/SoundBuffer.hpp>
#include <Nazara/Audio/SoundEmitter.hpp>
class NAZARA_API NzSound : public NzSoundEmitter
class NAZARA_AUDIO_API NzSound : public NzSoundEmitter
{
public:
NzSound() = default;

3
include/Nazara/Audio/SoundBuffer.hpp
View File

@@ -8,6 +8,7 @@
#define NAZARA_SOUNDBUFFER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Audio/Config.hpp>
#include <Nazara/Audio/Enums.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/NonCopyable.hpp>
@@ -37,7 +38,7 @@ using NzSoundBufferRef = NzObjectRef<NzSoundBuffer>;
struct NzSoundBufferImpl;
class NAZARA_API NzSoundBuffer : public NzRefCounted, public NzResource, NzNonCopyable
class NAZARA_AUDIO_API NzSoundBuffer : public NzRefCounted, public NzResource, NzNonCopyable
{
friend NzSound;
friend NzSoundBufferLibrary;

3
include/Nazara/Audio/SoundEmitter.hpp
View File

@@ -8,6 +8,7 @@
#define NAZARA_SOUNDEMITTER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Audio/Config.hpp>
#include <Nazara/Audio/Enums.hpp>
#include <Nazara/Core/InputStream.hpp>
#include <Nazara/Core/NonCopyable.hpp>
@@ -15,7 +16,7 @@
///TODO: Faire hériter SoundEmitter de Node
class NAZARA_API NzSoundEmitter
class NAZARA_AUDIO_API NzSoundEmitter
{
public:
virtual ~NzSoundEmitter();

3
include/Nazara/Audio/SoundStream.hpp
View File

@@ -8,9 +8,10 @@
#define NAZARA_SOUNDSTREAM_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Audio/Config.hpp>
#include <Nazara/Audio/Enums.hpp>
class NAZARA_API NzSoundStream
class NAZARA_AUDIO_API NzSoundStream
{
public:
NzSoundStream() = default;