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

Separate NAZARA_API into multiple defines (one per module) 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/scripts/module/audio.lua
View File

@ -2,6 +2,7 @@ if (not _OPTIONS["united"]) then
project "NazaraAudio" project "NazaraAudio"
end end
defines "NAZARA_AUDIO_BUILD"
defines "NAZARA_AUDIO_OPENAL" defines "NAZARA_AUDIO_OPENAL"
files files

2
build/scripts/module/core.lua
View File

@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then
project "NazaraCore" project "NazaraCore"
end end
defines "NAZARA_CORE_BUILD"
files files
{ {
"../include/Nazara/Prerequesites.hpp", "../include/Nazara/Prerequesites.hpp",

2
build/scripts/module/graphics.lua
View File

@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then
project "NazaraGraphics" project "NazaraGraphics"
end end
defines "NAZARA_GRAPHICS_BUILD"
files files
{ {
"../include/Nazara/Graphics/**.hpp", "../include/Nazara/Graphics/**.hpp",

2
build/scripts/module/lua.lua
View File

@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then
project "NazaraLua" project "NazaraLua"
end end
defines "NAZARA_LUA_BUILD"
files files
{ {
"../include/Nazara/Lua/**.hpp", "../include/Nazara/Lua/**.hpp",

2
build/scripts/module/noise.lua
View File

@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then
project "NazaraNoise" project "NazaraNoise"
end end
defines "NAZARA_NOISE_BUILD"
files files
{ {
"../include/Nazara/Noise/**.hpp", "../include/Nazara/Noise/**.hpp",

2
build/scripts/module/physics.lua
View File

@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then
project "NazaraPhysics" project "NazaraPhysics"
end end
defines "NAZARA_PHYSICS_BUILD"
files files
{ {
"../include/Nazara/Physics/**.hpp", "../include/Nazara/Physics/**.hpp",

1
build/scripts/module/renderer.lua
View File

@ -2,6 +2,7 @@ if (not _OPTIONS["united"]) then
project "NazaraRenderer" project "NazaraRenderer"
end end
defines "NAZARA_RENDERER_BUILD"
defines "NAZARA_RENDERER_OPENGL" defines "NAZARA_RENDERER_OPENGL"
files files

2
build/scripts/module/utility.lua
View File

@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then
project "NazaraUtility" project "NazaraUtility"
end end
defines "NAZARA_UTILITY_BUILD"
files files
{ {
"../include/Nazara/Utility/**.hpp", "../include/Nazara/Utility/**.hpp",

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

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

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

@ -41,4 +41,14 @@
/// Vérification des valeurs et types de certaines constantes /// Vérification des valeurs et types de certaines constantes
#include <Nazara/Audio/ConfigCheck.hpp> #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 #endif // NAZARA_CONFIG_AUDIO_HPP

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

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

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

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

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

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

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

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

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

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

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

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

2
include/Nazara/Core/AbstractHash.hpp
View File

@ -12,7 +12,7 @@
class NzHashDigest; class NzHashDigest;
class NAZARA_API NzAbstractHash : NzNonCopyable class NAZARA_CORE_API NzAbstractHash : NzNonCopyable
{ {
public: public:
NzAbstractHash() = default; NzAbstractHash() = default;

6
include/Nazara/Core/ByteArray.hpp
View File

@ -15,7 +15,7 @@
class NzAbstractHash; class NzAbstractHash;
class NzHashDigest; class NzHashDigest;
class NAZARA_API NzByteArray : public NzHashable class NAZARA_CORE_API NzByteArray : public NzHashable
{ {
public: public:
struct SharedArray; struct SharedArray;
@ -86,7 +86,7 @@ class NAZARA_API NzByteArray : public NzHashable
static int Compare(const NzByteArray& first, const NzByteArray& second); static int Compare(const NzByteArray& first, const NzByteArray& second);
struct NAZARA_API SharedArray struct NAZARA_CORE_API SharedArray
{ {
SharedArray() : SharedArray() :
refCount(1) refCount(1)
@ -121,7 +121,7 @@ class NAZARA_API NzByteArray : public NzHashable
namespace std namespace std
{ {
NAZARA_API void swap(NzByteArray& lhs, NzByteArray& rhs); NAZARA_CORE_API void swap(NzByteArray& lhs, NzByteArray& rhs);
} }
#endif // NAZARA_BYTEARRAY_HPP #endif // NAZARA_BYTEARRAY_HPP

6
include/Nazara/Core/Clock.hpp
View File

@ -15,7 +15,7 @@
#include <Nazara/Core/ThreadSafetyOff.hpp> #include <Nazara/Core/ThreadSafetyOff.hpp>
#endif #endif
class NAZARA_API NzClock class NAZARA_CORE_API NzClock
{ {
public: public:
NzClock(nzUInt64 startingValue = 0, bool paused = false); NzClock(nzUInt64 startingValue = 0, bool paused = false);
@ -43,7 +43,7 @@ class NAZARA_API NzClock
typedef nzUInt64 (*NzClockFunction)(); typedef nzUInt64 (*NzClockFunction)();
extern NAZARA_API NzClockFunction NzGetMicroseconds; extern NAZARA_CORE_API NzClockFunction NzGetMicroseconds;
extern NAZARA_API NzClockFunction NzGetMilliseconds; extern NAZARA_CORE_API NzClockFunction NzGetMilliseconds;
#endif // NAZARA_CLOCK_HPP #endif // NAZARA_CLOCK_HPP

2
include/Nazara/Core/Color.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <Nazara/Math/Vector3.hpp> #include <Nazara/Math/Vector3.hpp>
class NAZARA_API NzColor class NAZARA_CORE_API NzColor
{ {
public: public:
NzColor(); NzColor();

2
include/Nazara/Core/ConditionVariable.hpp
View File

@ -12,7 +12,7 @@
class NzConditionVariableImpl; class NzConditionVariableImpl;
class NzMutex; class NzMutex;
class NAZARA_API NzConditionVariable class NAZARA_CORE_API NzConditionVariable
{ {
public: public:
NzConditionVariable(); NzConditionVariable();

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

@ -78,4 +78,14 @@
/// Vérification des valeurs et types de certaines constantes /// Vérification des valeurs et types de certaines constantes
#include <Nazara/Core/ConfigCheck.hpp> #include <Nazara/Core/ConfigCheck.hpp>
#if defined(NAZARA_STATIC)
#define NAZARA_CORE_API
#else
#ifdef NAZARA_CORE_BUILD
#define NAZARA_CORE_API NAZARA_EXPORT
#else
#define NAZARA_CORE_API NAZARA_IMPORT
#endif
#endif
#endif // NAZARA_CONFIG_CORE_HPP #endif // NAZARA_CONFIG_CORE_HPP

2
include/Nazara/Core/Core.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Initializer.hpp> #include <Nazara/Core/Initializer.hpp>
class NAZARA_API NzCore class NAZARA_CORE_API NzCore
{ {
public: public:
NzCore() = delete; NzCore() = delete;

8
include/Nazara/Core/Debug/NewRedefinition.hpp
View File

@ -13,10 +13,10 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/MemoryManager.hpp> #include <Nazara/Core/MemoryManager.hpp>
NAZARA_API void* operator new(std::size_t size, const char* file, unsigned int line); NAZARA_CORE_API void* operator new(std::size_t size, const char* file, unsigned int line);
NAZARA_API void* operator new[](std::size_t size, const char* file, unsigned int line); NAZARA_CORE_API void* operator new[](std::size_t size, const char* file, unsigned int line);
NAZARA_API void operator delete(void* ptr, const char* file, unsigned int line) noexcept; NAZARA_CORE_API void operator delete(void* ptr, const char* file, unsigned int line) noexcept;
NAZARA_API void operator delete[](void* ptr, const char* file, unsigned int line) noexcept; NAZARA_CORE_API void operator delete[](void* ptr, const char* file, unsigned int line) noexcept;
#endif // NAZARA_DEBUG_NEWREDEFINITION_HPP #endif // NAZARA_DEBUG_NEWREDEFINITION_HPP

2
include/Nazara/Core/Directory.hpp
View File

@ -28,7 +28,7 @@
class NzDirectoryImpl; class NzDirectoryImpl;
class NAZARA_API NzDirectory : NzNonCopyable class NAZARA_CORE_API NzDirectory : NzNonCopyable
{ {
public: public:
NzDirectory(); NzDirectory();

2
include/Nazara/Core/DynLib.hpp
View File

@ -31,7 +31,7 @@ using NzDynLibFunc = int (*)(); // Type "générique" de pointeur sur fonction
class NzDynLibImpl; class NzDynLibImpl;
class NAZARA_API NzDynLib : NzNonCopyable class NAZARA_CORE_API NzDynLib : NzNonCopyable
{ {
public: public:
NzDynLib(); NzDynLib();

2
include/Nazara/Core/Error.hpp
View File

@ -23,7 +23,7 @@
#define NazaraInternalError(err) NzError::Error(nzErrorType_Internal, err, __LINE__, NzDirectory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION) #define NazaraInternalError(err) NzError::Error(nzErrorType_Internal, err, __LINE__, NzDirectory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION)
#define NazaraWarning(err) NzError::Error(nzErrorType_Warning, err, __LINE__, NzDirectory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION) #define NazaraWarning(err) NzError::Error(nzErrorType_Warning, err, __LINE__, NzDirectory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION)
class NAZARA_API NzError class NAZARA_CORE_API NzError
{ {
public: public:
NzError() = delete; NzError() = delete;

2
include/Nazara/Core/ErrorFlags.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Core/Enums.hpp> #include <Nazara/Core/Enums.hpp>
#include <Nazara/Core/NonCopyable.hpp> #include <Nazara/Core/NonCopyable.hpp>
class NAZARA_API NzErrorFlags : NzNonCopyable class NAZARA_CORE_API NzErrorFlags : NzNonCopyable
{ {
public: public:
NzErrorFlags(nzUInt32 flags, bool replace = false); NzErrorFlags(nzUInt32 flags, bool replace = false);

2
include/Nazara/Core/File.hpp
View File

@ -25,7 +25,7 @@
class NzFileImpl; class NzFileImpl;
class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable
{ {
public: public:
enum CursorPosition enum CursorPosition

2
include/Nazara/Core/GuillotineBinPack.hpp
View File

@ -15,7 +15,7 @@
#include <Nazara/Math/Rect.hpp> #include <Nazara/Math/Rect.hpp>
#include <vector> #include <vector>
class NAZARA_API NzGuillotineBinPack class NAZARA_CORE_API NzGuillotineBinPack
{ {
public: public:
enum FreeRectChoiceHeuristic : int; enum FreeRectChoiceHeuristic : int;

2
include/Nazara/Core/HardwareInfo.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Core/Enums.hpp> #include <Nazara/Core/Enums.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
class NAZARA_API NzHardwareInfo class NAZARA_CORE_API NzHardwareInfo
{ {
public: public:
static void Cpuid(nzUInt32 functionId, nzUInt32 subFunctionId, nzUInt32 result[4]); static void Cpuid(nzUInt32 functionId, nzUInt32 subFunctionId, nzUInt32 result[4]);

2
include/Nazara/Core/Hash.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Core/HashDigest.hpp> #include <Nazara/Core/HashDigest.hpp>
#include <Nazara/Core/NonCopyable.hpp> #include <Nazara/Core/NonCopyable.hpp>
class NAZARA_API NzHash : NzNonCopyable class NAZARA_CORE_API NzHash : NzNonCopyable
{ {
public: public:
NzHash(nzHash hash); NzHash(nzHash hash);

2
include/Nazara/Core/Hash/CRC32.hpp
View File

@ -13,7 +13,7 @@
struct NzHashCRC32_state; struct NzHashCRC32_state;
class NAZARA_API NzHashCRC32 : public NzAbstractHash class NAZARA_CORE_API NzHashCRC32 : public NzAbstractHash
{ {
public: public:
NzHashCRC32(nzUInt32 polynomial = 0x04c11db7); NzHashCRC32(nzUInt32 polynomial = 0x04c11db7);

2
include/Nazara/Core/Hash/Fletcher16.hpp
View File

@ -14,7 +14,7 @@
struct NzHashFletcher16_state; struct NzHashFletcher16_state;
class NAZARA_API NzHashFletcher16 : public NzAbstractHash class NAZARA_CORE_API NzHashFletcher16 : public NzAbstractHash
{ {
public: public:
NzHashFletcher16(); NzHashFletcher16();

2
include/Nazara/Core/Hash/MD5.hpp
View File

@ -13,7 +13,7 @@
struct NzHashMD5_state; struct NzHashMD5_state;
class NAZARA_API NzHashMD5 : public NzAbstractHash class NAZARA_CORE_API NzHashMD5 : public NzAbstractHash
{ {
public: public:
NzHashMD5(); NzHashMD5();

2
include/Nazara/Core/Hash/SHA1.hpp
View File

@ -13,7 +13,7 @@
union SHA_CTX; union SHA_CTX;
class NAZARA_API NzHashSHA1 : public NzAbstractHash class NAZARA_CORE_API NzHashSHA1 : public NzAbstractHash
{ {
public: public:
NzHashSHA1(); NzHashSHA1();

2
include/Nazara/Core/Hash/SHA224.hpp
View File

@ -13,7 +13,7 @@
union SHA_CTX; union SHA_CTX;
class NAZARA_API NzHashSHA224 : public NzAbstractHash class NAZARA_CORE_API NzHashSHA224 : public NzAbstractHash
{ {
public: public:
NzHashSHA224(); NzHashSHA224();

2
include/Nazara/Core/Hash/SHA256.hpp
View File

@ -13,7 +13,7 @@
union SHA_CTX; union SHA_CTX;
class NAZARA_API NzHashSHA256 : public NzAbstractHash class NAZARA_CORE_API NzHashSHA256 : public NzAbstractHash
{ {
public: public:
NzHashSHA256(); NzHashSHA256();

2
include/Nazara/Core/Hash/SHA384.hpp
View File

@ -13,7 +13,7 @@
union SHA_CTX; union SHA_CTX;
class NAZARA_API NzHashSHA384 : public NzAbstractHash class NAZARA_CORE_API NzHashSHA384 : public NzAbstractHash
{ {
public: public:
NzHashSHA384(); NzHashSHA384();

2
include/Nazara/Core/Hash/SHA512.hpp
View File

@ -13,7 +13,7 @@
union SHA_CTX; union SHA_CTX;
class NAZARA_API NzHashSHA512 : public NzAbstractHash class NAZARA_CORE_API NzHashSHA512 : public NzAbstractHash
{ {
public: public:
NzHashSHA512(); NzHashSHA512();

2
include/Nazara/Core/Hash/Whirlpool.hpp
View File

@ -11,7 +11,7 @@
struct NzHashWhirlpool_state; struct NzHashWhirlpool_state;
class NAZARA_API NzHashWhirlpool : public NzAbstractHash class NAZARA_CORE_API NzHashWhirlpool : public NzAbstractHash
{ {
public: public:
NzHashWhirlpool(); NzHashWhirlpool();

4
include/Nazara/Core/HashDigest.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <iosfwd> #include <iosfwd>
class NAZARA_API NzHashDigest class NAZARA_CORE_API NzHashDigest
{ {
public: public:
NzHashDigest(); NzHashDigest();
@ -42,7 +42,7 @@ class NAZARA_API NzHashDigest
bool operator>(const NzHashDigest& rhs) const; bool operator>(const NzHashDigest& rhs) const;
bool operator>=(const NzHashDigest& rhs) const; bool operator>=(const NzHashDigest& rhs) const;
NAZARA_API friend std::ostream& operator<<(std::ostream& out, const NzHashDigest& string); NAZARA_CORE_API friend std::ostream& operator<<(std::ostream& out, const NzHashDigest& string);
private: private:
NzString m_hashName; NzString m_hashName;

2
include/Nazara/Core/Hashable.hpp
View File

@ -13,7 +13,7 @@
class NzAbstractHash; class NzAbstractHash;
class NzHashDigest; class NzHashDigest;
class NAZARA_API NzHashable class NAZARA_CORE_API NzHashable
{ {
friend class NzHash; friend class NzHash;

2
include/Nazara/Core/InputStream.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Stream.hpp> #include <Nazara/Core/Stream.hpp>
class NAZARA_API NzInputStream : public NzStream class NAZARA_CORE_API NzInputStream : public NzStream
{ {
public: public:
virtual ~NzInputStream(); virtual ~NzInputStream();

2
include/Nazara/Core/LockGuard.hpp
View File

@ -11,7 +11,7 @@
class NzMutex; class NzMutex;
class NAZARA_API NzLockGuard class NAZARA_CORE_API NzLockGuard
{ {
public: public:
NzLockGuard(NzMutex& mutex); NzLockGuard(NzMutex& mutex);

2
include/Nazara/Core/Log.hpp
View File

@ -29,7 +29,7 @@
class NzFile; class NzFile;
class NAZARA_API NzLog : NzNonCopyable class NAZARA_CORE_API NzLog : NzNonCopyable
{ {
public: public:
void Enable(bool enable); void Enable(bool enable);

2
include/Nazara/Core/MemoryManager.hpp
View File

@ -11,7 +11,7 @@
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
class NAZARA_API NzMemoryManager class NAZARA_CORE_API NzMemoryManager
{ {
public: public:
static void* Allocate(std::size_t size, bool multi = false, const char* file = nullptr, unsigned int line = 0); static void* Allocate(std::size_t size, bool multi = false, const char* file = nullptr, unsigned int line = 0);

2
include/Nazara/Core/MemoryStream.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/InputStream.hpp> #include <Nazara/Core/InputStream.hpp>
class NAZARA_API NzMemoryStream : public NzInputStream class NAZARA_CORE_API NzMemoryStream : public NzInputStream
{ {
public: public:
NzMemoryStream(const void* ptr, nzUInt64 size); NzMemoryStream(const void* ptr, nzUInt64 size);

2
include/Nazara/Core/Mutex.hpp
View File

@ -12,7 +12,7 @@
class NzMutexImpl; class NzMutexImpl;
class NAZARA_API NzMutex : NzNonCopyable class NAZARA_CORE_API NzMutex : NzNonCopyable
{ {
friend class NzConditionVariable; friend class NzConditionVariable;

2
include/Nazara/Core/NonCopyable.hpp
View File

@ -9,7 +9,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
class NAZARA_API NzNonCopyable class NAZARA_CORE_API NzNonCopyable
{ {
protected: protected:
NzNonCopyable() = default; NzNonCopyable() = default;

2
include/Nazara/Core/ParameterList.hpp
View File

@ -12,7 +12,7 @@
#include <atomic> #include <atomic>
#include <unordered_map> #include <unordered_map>
class NAZARA_API NzParameterList class NAZARA_CORE_API NzParameterList
{ {
public: public:
using Destructor = void (*)(void* value); using Destructor = void (*)(void* value);

2
include/Nazara/Core/PluginManager.hpp
View File

@ -17,7 +17,7 @@
class NzDynLib; class NzDynLib;
class NAZARA_API NzPluginManager class NAZARA_CORE_API NzPluginManager
{ {
public: public:
NzPluginManager() = delete; NzPluginManager() = delete;

2
include/Nazara/Core/PrimitiveList.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Core/Primitive.hpp> #include <Nazara/Core/Primitive.hpp>
#include <Nazara/Math/Quaternion.hpp> #include <Nazara/Math/Quaternion.hpp>
class NAZARA_API NzPrimitiveList class NAZARA_CORE_API NzPrimitiveList
{ {
public: public:
NzPrimitiveList() = default; NzPrimitiveList() = default;

2
include/Nazara/Core/RefCounted.hpp
View File

@ -17,7 +17,7 @@
#include <Nazara/Core/ThreadSafetyOff.hpp> #include <Nazara/Core/ThreadSafetyOff.hpp>
#endif #endif
class NAZARA_API NzRefCounted class NAZARA_CORE_API NzRefCounted
{ {
public: public:
NzRefCounted(bool persistent = true); NzRefCounted(bool persistent = true);

2
include/Nazara/Core/Resource.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
class NAZARA_API NzResource class NAZARA_CORE_API NzResource
{ {
public: public:
NzResource() = default; NzResource() = default;

2
include/Nazara/Core/Semaphore.hpp
View File

@ -12,7 +12,7 @@
class NzSemaphoreImpl; class NzSemaphoreImpl;
class NAZARA_API NzSemaphore : NzNonCopyable class NAZARA_CORE_API NzSemaphore : NzNonCopyable
{ {
public: public:
NzSemaphore(unsigned int count); NzSemaphore(unsigned int count);

2
include/Nazara/Core/Stream.hpp
View File

@ -11,7 +11,7 @@
#include <Nazara/Core/Enums.hpp> #include <Nazara/Core/Enums.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
class NAZARA_API NzStream class NAZARA_CORE_API NzStream
{ {
public: public:
NzStream() = default; NzStream() = default;

68
include/Nazara/Core/String.hpp
View File

@ -17,7 +17,7 @@
class NzAbstractHash; class NzAbstractHash;
class NzHashDigest; class NzHashDigest;
class NAZARA_API NzString : public NzHashable class NAZARA_CORE_API NzString : public NzHashable
{ {
public: public:
enum Flags enum Flags
@ -261,45 +261,45 @@ class NAZARA_API NzString : public NzHashable
static NzString Unicode(const char32_t* u32String); static NzString Unicode(const char32_t* u32String);
static NzString Unicode(const wchar_t* wString); static NzString Unicode(const wchar_t* wString);
NAZARA_API friend std::istream& operator>>(std::istream& in, NzString& string); NAZARA_CORE_API friend std::istream& operator>>(std::istream& in, NzString& string);
NAZARA_API friend std::ostream& operator<<(std::ostream& out, const NzString& string); NAZARA_CORE_API friend std::ostream& operator<<(std::ostream& out, const NzString& string);
NAZARA_API friend NzString operator+(char character, const NzString& string); NAZARA_CORE_API friend NzString operator+(char character, const NzString& string);
NAZARA_API friend NzString operator+(const char* string, const NzString& nstring); NAZARA_CORE_API friend NzString operator+(const char* string, const NzString& nstring);
NAZARA_API friend NzString operator+(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend NzString operator+(const std::string& string, const NzString& nstring);
NAZARA_API friend bool operator==(const NzString& first, const NzString& second); NAZARA_CORE_API friend bool operator==(const NzString& first, const NzString& second);
NAZARA_API friend bool operator!=(const NzString& first, const NzString& second); NAZARA_CORE_API friend bool operator!=(const NzString& first, const NzString& second);
NAZARA_API friend bool operator<(const NzString& first, const NzString& second); NAZARA_CORE_API friend bool operator<(const NzString& first, const NzString& second);
NAZARA_API friend bool operator<=(const NzString& first, const NzString& second); NAZARA_CORE_API friend bool operator<=(const NzString& first, const NzString& second);
NAZARA_API friend bool operator>(const NzString& first, const NzString& second); NAZARA_CORE_API friend bool operator>(const NzString& first, const NzString& second);
NAZARA_API friend bool operator>=(const NzString& first, const NzString& second); NAZARA_CORE_API friend bool operator>=(const NzString& first, const NzString& second);
NAZARA_API friend bool operator==(char character, const NzString& nstring); NAZARA_CORE_API friend bool operator==(char character, const NzString& nstring);
NAZARA_API friend bool operator==(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator==(const char* string, const NzString& nstring);
NAZARA_API friend bool operator==(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator==(const std::string& string, const NzString& nstring);
NAZARA_API friend bool operator!=(char character, const NzString& nstring); NAZARA_CORE_API friend bool operator!=(char character, const NzString& nstring);
NAZARA_API friend bool operator!=(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator!=(const char* string, const NzString& nstring);
NAZARA_API friend bool operator!=(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator!=(const std::string& string, const NzString& nstring);
NAZARA_API friend bool operator<(char character, const NzString& nstring); NAZARA_CORE_API friend bool operator<(char character, const NzString& nstring);
NAZARA_API friend bool operator<(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator<(const char* string, const NzString& nstring);
NAZARA_API friend bool operator<(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator<(const std::string& string, const NzString& nstring);
NAZARA_API friend bool operator<=(char character, const NzString& nstring); NAZARA_CORE_API friend bool operator<=(char character, const NzString& nstring);
NAZARA_API friend bool operator<=(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator<=(const char* string, const NzString& nstring);
NAZARA_API friend bool operator<=(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator<=(const std::string& string, const NzString& nstring);
NAZARA_API friend bool operator>(char character, const NzString& nstring); NAZARA_CORE_API friend bool operator>(char character, const NzString& nstring);
NAZARA_API friend bool operator>(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator>(const char* string, const NzString& nstring);
NAZARA_API friend bool operator>(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator>(const std::string& string, const NzString& nstring);
NAZARA_API friend bool operator>=(char character, const NzString& nstring); NAZARA_CORE_API friend bool operator>=(char character, const NzString& nstring);
NAZARA_API friend bool operator>=(const char* string, const NzString& nstring); NAZARA_CORE_API friend bool operator>=(const char* string, const NzString& nstring);
NAZARA_API friend bool operator>=(const std::string& string, const NzString& nstring); NAZARA_CORE_API friend bool operator>=(const std::string& string, const NzString& nstring);
struct NAZARA_API SharedString struct NAZARA_CORE_API SharedString
{ {
SharedString() : SharedString() :
refCount(1) refCount(1)
@ -334,9 +334,9 @@ class NAZARA_API NzString : public NzHashable
namespace std namespace std
{ {
NAZARA_API istream& getline(istream& is, NzString& str); NAZARA_CORE_API istream& getline(istream& is, NzString& str);
NAZARA_API istream& getline(istream& is, NzString& str, char delim); NAZARA_CORE_API istream& getline(istream& is, NzString& str, char delim);
NAZARA_API void swap(NzString& lhs, NzString& rhs); NAZARA_CORE_API void swap(NzString& lhs, NzString& rhs);
} }
#include <Nazara/Core/String.inl> #include <Nazara/Core/String.inl>

2
include/Nazara/Core/StringStream.hpp
View File

@ -12,7 +12,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
class NAZARA_API NzStringStream class NAZARA_CORE_API NzStringStream
{ {
public: public:
NzStringStream(); NzStringStream();

2
include/Nazara/Core/TaskScheduler.hpp
View File

@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Functor.hpp> #include <Nazara/Core/Functor.hpp>
class NAZARA_API NzTaskScheduler class NAZARA_CORE_API NzTaskScheduler
{ {
public: public:
NzTaskScheduler() = delete; NzTaskScheduler() = delete;

18
include/Nazara/Core/Thread.hpp
View File

@ -14,7 +14,7 @@
class NzThreadImpl; class NzThreadImpl;
class NAZARA_API NzThread : NzNonCopyable class NAZARA_CORE_API NzThread : NzNonCopyable
{ {
public: public:
class Id; class Id;
@ -42,19 +42,19 @@ class NAZARA_API NzThread : NzNonCopyable
NzThreadImpl* m_impl; NzThreadImpl* m_impl;
}; };
class NAZARA_API NzThread::Id class NAZARA_CORE_API NzThread::Id
{ {
friend NzThread; friend NzThread;
public: public:
NAZARA_API friend bool operator==(const Id& lhs, const Id& rhs); NAZARA_CORE_API friend bool operator==(const Id& lhs, const Id& rhs);
NAZARA_API friend bool operator!=(const Id& lhs, const Id& rhs); NAZARA_CORE_API friend bool operator!=(const Id& lhs, const Id& rhs);
NAZARA_API friend bool operator<(const Id& lhs, const Id& rhs); NAZARA_CORE_API friend bool operator<(const Id& lhs, const Id& rhs);
NAZARA_API friend bool operator<=(const Id& lhs, const Id& rhs); NAZARA_CORE_API friend bool operator<=(const Id& lhs, const Id& rhs);
NAZARA_API friend bool operator>(const Id& lhs, const Id& rhs); NAZARA_CORE_API friend bool operator>(const Id& lhs, const Id& rhs);
NAZARA_API friend bool operator>=(const Id& lhs, const Id& rhs); NAZARA_CORE_API friend bool operator>=(const Id& lhs, const Id& rhs);
NAZARA_API friend std::ostream& operator<<(std::ostream& o, const Id& id); NAZARA_CORE_API friend std::ostream& operator<<(std::ostream& o, const Id& id);
private: private:
Id(NzThreadImpl* thread); Id(NzThreadImpl* thread);

2
include/Nazara/Core/Updatable.hpp
View File

@ -9,7 +9,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
class NAZARA_API NzUpdatable class NAZARA_CORE_API NzUpdatable
{ {
public: public:
NzUpdatable() = default; NzUpdatable() = default;

3
include/Nazara/Graphics/AbstractBackground.hpp
View File

@ -8,11 +8,12 @@
#define NAZARA_ABSTRACTBACKGROUND_HPP #define NAZARA_ABSTRACTBACKGROUND_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
class NzAbstractViewer; class NzAbstractViewer;
class NAZARA_API NzAbstractBackground class NAZARA_GRAPHICS_API NzAbstractBackground
{ {
public: public:
NzAbstractBackground() = default; NzAbstractBackground() = default;

3
include/Nazara/Graphics/AbstractRenderQueue.hpp
View File

@ -11,6 +11,7 @@
#include <Nazara/Core/Color.hpp> #include <Nazara/Core/Color.hpp>
#include <Nazara/Core/NonCopyable.hpp> #include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Core/SparsePtr.hpp> #include <Nazara/Core/SparsePtr.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Math/Box.hpp> #include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Matrix4.hpp> #include <Nazara/Math/Matrix4.hpp>
#include <Nazara/Utility/Enums.hpp> #include <Nazara/Utility/Enums.hpp>
@ -22,7 +23,7 @@ class NzMaterial;
class NzTexture; class NzTexture;
struct NzMeshData; struct NzMeshData;
class NAZARA_API NzAbstractRenderQueue : NzNonCopyable class NAZARA_GRAPHICS_API NzAbstractRenderQueue : NzNonCopyable
{ {
public: public:
struct DirectionalLight; struct DirectionalLight;

2
include/Nazara/Graphics/AbstractRenderTechnique.hpp
View File

@ -19,7 +19,7 @@ class NzAbstractViewer;
class NzBackground; class NzBackground;
struct SceneData; struct SceneData;
class NAZARA_API NzAbstractRenderTechnique : NzNonCopyable class NAZARA_GRAPHICS_API NzAbstractRenderTechnique : NzNonCopyable
{ {
public: public:
NzAbstractRenderTechnique(); NzAbstractRenderTechnique();

3
include/Nazara/Graphics/AbstractViewer.hpp
View File

@ -8,6 +8,7 @@
#define NAZARA_ABSTRACTVIEWER_HPP #define NAZARA_ABSTRACTVIEWER_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Math/Frustum.hpp> #include <Nazara/Math/Frustum.hpp>
#include <Nazara/Math/Matrix4.hpp> #include <Nazara/Math/Matrix4.hpp>
@ -16,7 +17,7 @@
class NzRenderTarget; class NzRenderTarget;
class NzScene; class NzScene;
class NAZARA_API NzAbstractViewer class NAZARA_GRAPHICS_API NzAbstractViewer
{ {
public: public:
NzAbstractViewer() = default; NzAbstractViewer() = default;

2
include/Nazara/Graphics/Camera.hpp
View File

@ -16,7 +16,7 @@
#include <Nazara/Renderer/RenderTarget.hpp> #include <Nazara/Renderer/RenderTarget.hpp>
#include <Nazara/Utility/Node.hpp> #include <Nazara/Utility/Node.hpp>
class NAZARA_API NzCamera : public NzAbstractViewer, public NzNode class NAZARA_GRAPHICS_API NzCamera : public NzAbstractViewer, public NzNode
{ {
public: public:
NzCamera(); NzCamera();

2
include/Nazara/Graphics/ColorBackground.hpp
View File

@ -12,7 +12,7 @@
#include <Nazara/Graphics/AbstractBackground.hpp> #include <Nazara/Graphics/AbstractBackground.hpp>
#include <Nazara/Renderer/UberShader.hpp> #include <Nazara/Renderer/UberShader.hpp>
class NAZARA_API NzColorBackground : public NzAbstractBackground class NAZARA_GRAPHICS_API NzColorBackground : public NzAbstractBackground
{ {
public: public:
NzColorBackground(const NzColor& color = NzColor::Black); NzColorBackground(const NzColor& color = NzColor::Black);

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

@ -46,4 +46,14 @@
/// Vérification des valeurs et types de certaines constantes /// Vérification des valeurs et types de certaines constantes
#include <Nazara/Graphics/ConfigCheck.hpp> #include <Nazara/Graphics/ConfigCheck.hpp>
#if defined(NAZARA_STATIC)
#define NAZARA_GRAPHICS_API
#else
#ifdef NAZARA_GRAPHICS_BUILD
#define NAZARA_GRAPHICS_API NAZARA_EXPORT
#else
#define NAZARA_GRAPHICS_API NAZARA_IMPORT
#endif
#endif
#endif // NAZARA_CONFIG_GRAPHICS_HPP #endif // NAZARA_CONFIG_GRAPHICS_HPP

2
include/Nazara/Graphics/DeferredBloomPass.hpp
View File

@ -15,7 +15,7 @@
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
class NAZARA_API NzDeferredBloomPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredBloomPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredBloomPass(); NzDeferredBloomPass();

2
include/Nazara/Graphics/DeferredDOFPass.hpp
View File

@ -15,7 +15,7 @@
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
class NAZARA_API NzDeferredDOFPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredDOFPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredDOFPass(); NzDeferredDOFPass();

2
include/Nazara/Graphics/DeferredFXAAPass.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Renderer/Shader.hpp> #include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
class NAZARA_API NzDeferredFXAAPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredFXAAPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredFXAAPass(); NzDeferredFXAAPass();

2
include/Nazara/Graphics/DeferredFinalPass.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
#include <Nazara/Renderer/UberShader.hpp> #include <Nazara/Renderer/UberShader.hpp>
class NAZARA_API NzDeferredFinalPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredFinalPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredFinalPass(); NzDeferredFinalPass();

2
include/Nazara/Graphics/DeferredFogPass.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Renderer/Shader.hpp> #include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
class NAZARA_API NzDeferredFogPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredFogPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredFogPass(); NzDeferredFogPass();

2
include/Nazara/Graphics/DeferredForwardPass.hpp
View File

@ -12,7 +12,7 @@
class NzForwardRenderTechnique; class NzForwardRenderTechnique;
class NAZARA_API NzDeferredForwardPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredForwardPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredForwardPass(); NzDeferredForwardPass();

2
include/Nazara/Graphics/DeferredGeometryPass.hpp
View File

@ -13,7 +13,7 @@
#include <Nazara/Renderer/Shader.hpp> #include <Nazara/Renderer/Shader.hpp>
#include <unordered_map> #include <unordered_map>
class NAZARA_API NzDeferredGeometryPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredGeometryPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredGeometryPass(); NzDeferredGeometryPass();

2
include/Nazara/Graphics/DeferredPhongLightingPass.hpp
View File

@ -16,7 +16,7 @@
class NzStaticMesh; class NzStaticMesh;
class NAZARA_API NzDeferredPhongLightingPass : public NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredPhongLightingPass : public NzDeferredRenderPass
{ {
public: public:
NzDeferredPhongLightingPass(); NzDeferredPhongLightingPass();

3
include/Nazara/Graphics/DeferredRenderPass.hpp
View File

@ -8,6 +8,7 @@
#define NAZARA_DEFERREDRENDERPASS_HPP #define NAZARA_DEFERREDRENDERPASS_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Graphics/SceneData.hpp> #include <Nazara/Graphics/SceneData.hpp>
#include <Nazara/Math/Vector2.hpp> #include <Nazara/Math/Vector2.hpp>
@ -20,7 +21,7 @@ class NzRenderTexture;
class NzScene; class NzScene;
class NzTexture; class NzTexture;
class NAZARA_API NzDeferredRenderPass class NAZARA_GRAPHICS_API NzDeferredRenderPass
{ {
friend NzDeferredRenderTechnique; friend NzDeferredRenderTechnique;

2
include/Nazara/Graphics/DeferredRenderQueue.hpp
View File

@ -21,7 +21,7 @@
class NzForwardRenderQueue; class NzForwardRenderQueue;
class NAZARA_API NzDeferredRenderQueue : public NzAbstractRenderQueue class NAZARA_GRAPHICS_API NzDeferredRenderQueue : public NzAbstractRenderQueue
{ {
public: public:
NzDeferredRenderQueue(NzForwardRenderQueue* forwardQueue); NzDeferredRenderQueue(NzForwardRenderQueue* forwardQueue);

2
include/Nazara/Graphics/DeferredRenderTechnique.hpp
View File

@ -22,7 +22,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
class NAZARA_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique class NAZARA_GRAPHICS_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique
{ {
friend class NzGraphics; friend class NzGraphics;

3
include/Nazara/Graphics/Drawable.hpp
View File

@ -8,8 +8,9 @@
#define NAZARA_DRAWABLE_HPP #define NAZARA_DRAWABLE_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
class NAZARA_API NzDrawable class NAZARA_GRAPHICS_API NzDrawable
{ {
public: public:
NzDrawable() = default; NzDrawable() = default;

2
include/Nazara/Graphics/ForwardRenderQueue.hpp
View File

@ -21,7 +21,7 @@
class NzAbstractViewer; class NzAbstractViewer;
class NAZARA_API NzForwardRenderQueue : public NzAbstractRenderQueue class NAZARA_GRAPHICS_API NzForwardRenderQueue : public NzAbstractRenderQueue
{ {
friend class NzForwardRenderTechnique; friend class NzForwardRenderTechnique;

3
include/Nazara/Graphics/ForwardRenderTechnique.hpp
View File

@ -9,13 +9,14 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/AbstractRenderTechnique.hpp> #include <Nazara/Graphics/AbstractRenderTechnique.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/ForwardRenderQueue.hpp> #include <Nazara/Graphics/ForwardRenderQueue.hpp>
#include <Nazara/Graphics/Light.hpp> #include <Nazara/Graphics/Light.hpp>
#include <Nazara/Renderer/Shader.hpp> #include <Nazara/Renderer/Shader.hpp>
#include <Nazara/Utility/IndexBuffer.hpp> #include <Nazara/Utility/IndexBuffer.hpp>
#include <Nazara/Utility/VertexBuffer.hpp> #include <Nazara/Utility/VertexBuffer.hpp>
class NAZARA_API NzForwardRenderTechnique : public NzAbstractRenderTechnique class NAZARA_GRAPHICS_API NzForwardRenderTechnique : public NzAbstractRenderTechnique
{ {
public: public:
NzForwardRenderTechnique(); NzForwardRenderTechnique();

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

@ -9,8 +9,9 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/Initializer.hpp> #include <Nazara/Core/Initializer.hpp>
#include <Nazara/Graphics/Config.hpp>
class NAZARA_API NzGraphics class NAZARA_GRAPHICS_API NzGraphics
{ {
public: public:
NzGraphics() = delete; NzGraphics() = delete;

3
include/Nazara/Graphics/GuillotineTextureAtlas.hpp
View File

@ -8,9 +8,10 @@
#define NAZARA_GUILLOTINETEXTUREATLAS_HPP #define NAZARA_GUILLOTINETEXTUREATLAS_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Utility/GuillotineImageAtlas.hpp> #include <Nazara/Utility/GuillotineImageAtlas.hpp>
class NAZARA_API NzGuillotineTextureAtlas : public NzGuillotineImageAtlas class NAZARA_GRAPHICS_API NzGuillotineTextureAtlas : public NzGuillotineImageAtlas
{ {
public: public:
NzGuillotineTextureAtlas() = default; NzGuillotineTextureAtlas() = default;

2
include/Nazara/Graphics/Light.hpp
View File

@ -22,7 +22,7 @@ using NzLightConstRef = NzObjectRef<const NzLight>;
using NzLightLibrary = NzObjectLibrary<NzLight>; using NzLightLibrary = NzObjectLibrary<NzLight>;
using NzLightRef = NzObjectRef<NzLight>; using NzLightRef = NzObjectRef<NzLight>;
class NAZARA_API NzLight : public NzRenderable class NAZARA_GRAPHICS_API NzLight : public NzRenderable
{ {
public: public:
NzLight(nzLightType type = nzLightType_Point); NzLight(nzLightType type = nzLightType_Point);

5
include/Nazara/Graphics/Material.hpp
View File

@ -17,13 +17,14 @@
#include <Nazara/Core/ResourceManager.hpp> #include <Nazara/Core/ResourceManager.hpp>
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Renderer/RenderStates.hpp> #include <Nazara/Renderer/RenderStates.hpp>
#include <Nazara/Renderer/Texture.hpp> #include <Nazara/Renderer/Texture.hpp>
#include <Nazara/Renderer/TextureSampler.hpp> #include <Nazara/Renderer/TextureSampler.hpp>
#include <Nazara/Renderer/UberShader.hpp> #include <Nazara/Renderer/UberShader.hpp>
struct NAZARA_API NzMaterialParams struct NAZARA_GRAPHICS_API NzMaterialParams
{ {
bool loadAlphaMap = true; bool loadAlphaMap = true;
bool loadDiffuseMap = true; bool loadDiffuseMap = true;
@ -44,7 +45,7 @@ using NzMaterialLoader = NzResourceLoader<NzMaterial, NzMaterialParams>;
using NzMaterialManager = NzResourceManager<NzMaterial, NzMaterialParams>; using NzMaterialManager = NzResourceManager<NzMaterial, NzMaterialParams>;
using NzMaterialRef = NzObjectRef<NzMaterial>; using NzMaterialRef = NzObjectRef<NzMaterial>;
class NAZARA_API NzMaterial : public NzRefCounted, public NzResource class NAZARA_GRAPHICS_API NzMaterial : public NzRefCounted, public NzResource
{ {
friend NzMaterialLibrary; friend NzMaterialLibrary;
friend NzMaterialLoader; friend NzMaterialLoader;

4
include/Nazara/Graphics/Model.hpp
View File

@ -14,7 +14,7 @@
#include <Nazara/Graphics/Renderable.hpp> #include <Nazara/Graphics/Renderable.hpp>
#include <Nazara/Utility/Mesh.hpp> #include <Nazara/Utility/Mesh.hpp>
struct NAZARA_API NzModelParameters struct NAZARA_GRAPHICS_API NzModelParameters
{ {
NzModelParameters(); NzModelParameters();
@ -31,7 +31,7 @@ using NzModelConstRef = NzObjectRef<const NzModel>;
using NzModelLoader = NzResourceLoader<NzModel, NzModelParameters>; using NzModelLoader = NzResourceLoader<NzModel, NzModelParameters>;
using NzModelRef = NzObjectRef<NzModel>; using NzModelRef = NzObjectRef<NzModel>;
class NAZARA_API NzModel : public NzRenderable, public NzResource class NAZARA_GRAPHICS_API NzModel : public NzRenderable, public NzResource
{ {
friend NzModelLoader; friend NzModelLoader;
friend class NzScene; friend class NzScene;

3
include/Nazara/Graphics/ParticleController.hpp
View File

@ -12,6 +12,7 @@
#include <Nazara/Core/ObjectRef.hpp> #include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp> #include <Nazara/Core/RefCounted.hpp>
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Graphics/Config.hpp>
class NzParticleController; class NzParticleController;
class NzParticleMapper; class NzParticleMapper;
@ -21,7 +22,7 @@ using NzParticleControllerConstRef = NzObjectRef<const NzParticleController>;
using NzParticleControllerLibrary = NzObjectLibrary<NzParticleController>; using NzParticleControllerLibrary = NzObjectLibrary<NzParticleController>;
using NzParticleControllerRef = NzObjectRef<NzParticleController>; using NzParticleControllerRef = NzObjectRef<NzParticleController>;
class NAZARA_API NzParticleController : public NzRefCounted class NAZARA_GRAPHICS_API NzParticleController : public NzRefCounted
{ {
friend NzParticleControllerLibrary; friend NzParticleControllerLibrary;
friend class NzGraphics; friend class NzGraphics;

3
include/Nazara/Graphics/ParticleDeclaration.hpp
View File

@ -12,6 +12,7 @@
#include <Nazara/Core/ObjectRef.hpp> #include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp> #include <Nazara/Core/RefCounted.hpp>
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Utility/Enums.hpp> #include <Nazara/Utility/Enums.hpp>
@ -21,7 +22,7 @@ using NzParticleDeclarationConstRef = NzObjectRef<const NzParticleDeclaration>;
using NzParticleDeclarationLibrary = NzObjectLibrary<NzParticleDeclaration>; using NzParticleDeclarationLibrary = NzObjectLibrary<NzParticleDeclaration>;
using NzParticleDeclarationRef = NzObjectRef<NzParticleDeclaration>; using NzParticleDeclarationRef = NzObjectRef<NzParticleDeclaration>;
class NAZARA_API NzParticleDeclaration : public NzRefCounted class NAZARA_GRAPHICS_API NzParticleDeclaration : public NzRefCounted
{ {
friend NzParticleDeclarationLibrary; friend NzParticleDeclarationLibrary;
friend class NzGraphics; friend class NzGraphics;

3
include/Nazara/Graphics/ParticleEmitter.hpp
View File

@ -8,12 +8,13 @@
#define NAZARA_PARTICLEEMITTER_HPP #define NAZARA_PARTICLEEMITTER_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Utility/Node.hpp> #include <Nazara/Utility/Node.hpp>
class NzParticleMapper; class NzParticleMapper;
class NzParticleSystem; class NzParticleSystem;
class NAZARA_API NzParticleEmitter : public NzNode class NAZARA_GRAPHICS_API NzParticleEmitter : public NzNode
{ {
public: public:
NzParticleEmitter(); NzParticleEmitter();

3
include/Nazara/Graphics/ParticleGenerator.hpp
View File

@ -12,6 +12,7 @@
#include <Nazara/Core/ObjectRef.hpp> #include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp> #include <Nazara/Core/RefCounted.hpp>
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Graphics/Config.hpp>
class NzParticleGenerator; class NzParticleGenerator;
class NzParticleMapper; class NzParticleMapper;
@ -21,7 +22,7 @@ using NzParticleGeneratorConstRef = NzObjectRef<const NzParticleGenerator>;
using NzParticleGeneratorLibrary = NzObjectLibrary<NzParticleGenerator>; using NzParticleGeneratorLibrary = NzObjectLibrary<NzParticleGenerator>;
using NzParticleGeneratorRef = NzObjectRef<NzParticleGenerator>; using NzParticleGeneratorRef = NzObjectRef<NzParticleGenerator>;
class NAZARA_API NzParticleGenerator : public NzRefCounted class NAZARA_GRAPHICS_API NzParticleGenerator : public NzRefCounted
{ {
friend NzParticleGeneratorLibrary; friend NzParticleGeneratorLibrary;
friend class NzGraphics; friend class NzGraphics;

2
include/Nazara/Graphics/ParticleMapper.hpp
View File

@ -12,7 +12,7 @@
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Graphics/ParticleDeclaration.hpp> #include <Nazara/Graphics/ParticleDeclaration.hpp>
class NAZARA_API NzParticleMapper class NAZARA_GRAPHICS_API NzParticleMapper
{ {
public: public:
NzParticleMapper(void* buffer, const NzParticleDeclaration* declaration); NzParticleMapper(void* buffer, const NzParticleDeclaration* declaration);

3
include/Nazara/Graphics/ParticleRenderer.hpp
View File

@ -12,6 +12,7 @@
#include <Nazara/Core/ObjectRef.hpp> #include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp> #include <Nazara/Core/RefCounted.hpp>
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Graphics/Config.hpp>
class NzAbstractRenderQueue; class NzAbstractRenderQueue;
class NzParticleMapper; class NzParticleMapper;
@ -22,7 +23,7 @@ using NzParticleRendererConstRef = NzObjectRef<const NzParticleRenderer>;
using NzParticleRendererLibrary = NzObjectLibrary<NzParticleRenderer>; using NzParticleRendererLibrary = NzObjectLibrary<NzParticleRenderer>;
using NzParticleRendererRef = NzObjectRef<NzParticleRenderer>; using NzParticleRendererRef = NzObjectRef<NzParticleRenderer>;
class NAZARA_API NzParticleRenderer : public NzRefCounted class NAZARA_GRAPHICS_API NzParticleRenderer : public NzRefCounted
{ {
friend NzParticleRendererLibrary; friend NzParticleRendererLibrary;
friend class NzGraphics; friend class NzGraphics;

2
include/Nazara/Graphics/ParticleSystem.hpp
View File

@ -21,7 +21,7 @@
#include <set> #include <set>
#include <vector> #include <vector>
class NAZARA_API NzParticleSystem : public NzSceneNode, NzUpdatable class NAZARA_GRAPHICS_API NzParticleSystem : public NzSceneNode, NzUpdatable
{ {
public: public:
NzParticleSystem(unsigned int maxParticleCount, nzParticleLayout layout); NzParticleSystem(unsigned int maxParticleCount, nzParticleLayout layout);

3
include/Nazara/Graphics/RenderTechniques.hpp
View File

@ -9,11 +9,12 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
class NzAbstractRenderTechnique; class NzAbstractRenderTechnique;
class NAZARA_API NzRenderTechniques class NAZARA_GRAPHICS_API NzRenderTechniques
{ {
public: public:
using RenderTechniqueFactory = NzAbstractRenderTechnique* (*)(); using RenderTechniqueFactory = NzAbstractRenderTechnique* (*)();

3
include/Nazara/Graphics/Renderable.hpp
View File

@ -13,6 +13,7 @@
#include <Nazara/Core/ObjectRef.hpp> #include <Nazara/Core/ObjectRef.hpp>
#include <Nazara/Core/RefCounted.hpp> #include <Nazara/Core/RefCounted.hpp>
#include <Nazara/Core/Signal.hpp> #include <Nazara/Core/Signal.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Math/BoundingVolume.hpp> #include <Nazara/Math/BoundingVolume.hpp>
#include <Nazara/Math/Frustum.hpp> #include <Nazara/Math/Frustum.hpp>
#include <Nazara/Math/Matrix4.hpp> #include <Nazara/Math/Matrix4.hpp>
@ -24,7 +25,7 @@ using NzRenderableConstRef = NzObjectRef<const NzRenderable>;
using NzRenderableLibrary = NzObjectLibrary<NzRenderable>; using NzRenderableLibrary = NzObjectLibrary<NzRenderable>;
using NzRenderableRef = NzObjectRef<NzRenderable>; using NzRenderableRef = NzObjectRef<NzRenderable>;
class NAZARA_API NzRenderable : public NzRefCounted class NAZARA_GRAPHICS_API NzRenderable : public NzRefCounted
{ {
public: public:
struct InstanceData; struct InstanceData;

2
include/Nazara/Graphics/Scene.hpp
View File

@ -25,7 +25,7 @@ class NzAbstractViewer;
class NzNode; class NzNode;
class NzSceneNode; class NzSceneNode;
class NAZARA_API NzScene class NAZARA_GRAPHICS_API NzScene
{ {
friend NzSceneNode; friend NzSceneNode;

3
include/Nazara/Graphics/SceneNode.hpp
View File

@ -8,6 +8,7 @@
#define NAZARA_SCENENODE_HPP #define NAZARA_SCENENODE_HPP
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
#include <Nazara/Graphics/Enums.hpp> #include <Nazara/Graphics/Enums.hpp>
#include <Nazara/Math/BoundingVolume.hpp> #include <Nazara/Math/BoundingVolume.hpp>
#include <Nazara/Math/Frustum.hpp> #include <Nazara/Math/Frustum.hpp>
@ -16,7 +17,7 @@
class NzAbstractRenderQueue; class NzAbstractRenderQueue;
class NzScene; class NzScene;
class NAZARA_API NzSceneNode : public NzNode class NAZARA_GRAPHICS_API NzSceneNode : public NzNode
{ {
friend NzScene; friend NzScene;

2
include/Nazara/Graphics/SceneRoot.hpp
View File

@ -12,7 +12,7 @@
class NzScene; class NzScene;
class NAZARA_API NzSceneRoot : public NzSceneNode class NAZARA_GRAPHICS_API NzSceneRoot : public NzSceneNode
{ {
friend NzScene; friend NzScene;

Some files were not shown because too many files have changed in this diff Show More