From 1fc17c8b5313cb3b0dff90ead253e778247c3d6c Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 13 Jun 2015 22:31:29 +0200 Subject: [PATCH] Separate NAZARA_API into multiple defines (one per module) To fix inter-module dependency Former-commit-id: 64704f020e0af22e529d38527323ba977187d4d0 --- build/scripts/module/audio.lua | 1 + build/scripts/module/core.lua | 2 + build/scripts/module/graphics.lua | 2 + build/scripts/module/lua.lua | 2 + build/scripts/module/noise.lua | 2 + build/scripts/module/physics.lua | 2 + build/scripts/module/renderer.lua | 1 + build/scripts/module/utility.lua | 2 + include/Nazara/Audio/Audio.hpp | 3 +- include/Nazara/Audio/Config.hpp | 10 + include/Nazara/Audio/Music.hpp | 2 +- include/Nazara/Audio/OpenAL.hpp | 189 +++++----- include/Nazara/Audio/Sound.hpp | 2 +- include/Nazara/Audio/SoundBuffer.hpp | 3 +- include/Nazara/Audio/SoundEmitter.hpp | 3 +- include/Nazara/Audio/SoundStream.hpp | 3 +- include/Nazara/Core/AbstractHash.hpp | 2 +- include/Nazara/Core/ByteArray.hpp | 6 +- include/Nazara/Core/Clock.hpp | 6 +- include/Nazara/Core/Color.hpp | 2 +- include/Nazara/Core/ConditionVariable.hpp | 2 +- include/Nazara/Core/Config.hpp | 10 + include/Nazara/Core/Core.hpp | 2 +- include/Nazara/Core/Debug/NewRedefinition.hpp | 8 +- include/Nazara/Core/Directory.hpp | 2 +- include/Nazara/Core/DynLib.hpp | 2 +- include/Nazara/Core/Error.hpp | 2 +- include/Nazara/Core/ErrorFlags.hpp | 2 +- include/Nazara/Core/File.hpp | 2 +- include/Nazara/Core/GuillotineBinPack.hpp | 2 +- include/Nazara/Core/HardwareInfo.hpp | 2 +- include/Nazara/Core/Hash.hpp | 2 +- include/Nazara/Core/Hash/CRC32.hpp | 2 +- include/Nazara/Core/Hash/Fletcher16.hpp | 2 +- include/Nazara/Core/Hash/MD5.hpp | 2 +- include/Nazara/Core/Hash/SHA1.hpp | 2 +- include/Nazara/Core/Hash/SHA224.hpp | 2 +- include/Nazara/Core/Hash/SHA256.hpp | 2 +- include/Nazara/Core/Hash/SHA384.hpp | 2 +- include/Nazara/Core/Hash/SHA512.hpp | 2 +- include/Nazara/Core/Hash/Whirlpool.hpp | 2 +- include/Nazara/Core/HashDigest.hpp | 4 +- include/Nazara/Core/Hashable.hpp | 2 +- include/Nazara/Core/InputStream.hpp | 2 +- include/Nazara/Core/LockGuard.hpp | 2 +- include/Nazara/Core/Log.hpp | 2 +- include/Nazara/Core/MemoryManager.hpp | 2 +- include/Nazara/Core/MemoryStream.hpp | 2 +- include/Nazara/Core/Mutex.hpp | 2 +- include/Nazara/Core/NonCopyable.hpp | 2 +- include/Nazara/Core/ParameterList.hpp | 2 +- include/Nazara/Core/PluginManager.hpp | 2 +- include/Nazara/Core/PrimitiveList.hpp | 2 +- include/Nazara/Core/RefCounted.hpp | 2 +- include/Nazara/Core/Resource.hpp | 2 +- include/Nazara/Core/Semaphore.hpp | 2 +- include/Nazara/Core/Stream.hpp | 2 +- include/Nazara/Core/String.hpp | 68 ++-- include/Nazara/Core/StringStream.hpp | 2 +- include/Nazara/Core/TaskScheduler.hpp | 2 +- include/Nazara/Core/Thread.hpp | 18 +- include/Nazara/Core/Updatable.hpp | 2 +- .../Nazara/Graphics/AbstractBackground.hpp | 3 +- .../Nazara/Graphics/AbstractRenderQueue.hpp | 3 +- .../Graphics/AbstractRenderTechnique.hpp | 2 +- include/Nazara/Graphics/AbstractViewer.hpp | 3 +- include/Nazara/Graphics/Camera.hpp | 2 +- include/Nazara/Graphics/ColorBackground.hpp | 2 +- include/Nazara/Graphics/Config.hpp | 10 + include/Nazara/Graphics/DeferredBloomPass.hpp | 2 +- include/Nazara/Graphics/DeferredDOFPass.hpp | 2 +- include/Nazara/Graphics/DeferredFXAAPass.hpp | 2 +- include/Nazara/Graphics/DeferredFinalPass.hpp | 2 +- include/Nazara/Graphics/DeferredFogPass.hpp | 2 +- .../Nazara/Graphics/DeferredForwardPass.hpp | 2 +- .../Nazara/Graphics/DeferredGeometryPass.hpp | 2 +- .../Graphics/DeferredPhongLightingPass.hpp | 2 +- .../Nazara/Graphics/DeferredRenderPass.hpp | 3 +- .../Nazara/Graphics/DeferredRenderQueue.hpp | 2 +- .../Graphics/DeferredRenderTechnique.hpp | 2 +- include/Nazara/Graphics/Drawable.hpp | 3 +- .../Nazara/Graphics/ForwardRenderQueue.hpp | 2 +- .../Graphics/ForwardRenderTechnique.hpp | 3 +- include/Nazara/Graphics/Graphics.hpp | 3 +- .../Graphics/GuillotineTextureAtlas.hpp | 3 +- include/Nazara/Graphics/Light.hpp | 2 +- include/Nazara/Graphics/Material.hpp | 5 +- include/Nazara/Graphics/Model.hpp | 4 +- .../Nazara/Graphics/ParticleController.hpp | 3 +- .../Nazara/Graphics/ParticleDeclaration.hpp | 3 +- include/Nazara/Graphics/ParticleEmitter.hpp | 3 +- include/Nazara/Graphics/ParticleGenerator.hpp | 3 +- include/Nazara/Graphics/ParticleMapper.hpp | 2 +- include/Nazara/Graphics/ParticleRenderer.hpp | 3 +- include/Nazara/Graphics/ParticleSystem.hpp | 2 +- include/Nazara/Graphics/RenderTechniques.hpp | 3 +- include/Nazara/Graphics/Renderable.hpp | 3 +- include/Nazara/Graphics/Scene.hpp | 2 +- include/Nazara/Graphics/SceneNode.hpp | 3 +- include/Nazara/Graphics/SceneRoot.hpp | 2 +- include/Nazara/Graphics/SkeletalModel.hpp | 4 +- include/Nazara/Graphics/SkinningManager.hpp | 3 +- include/Nazara/Graphics/SkyboxBackground.hpp | 2 +- include/Nazara/Graphics/Sprite.hpp | 2 +- include/Nazara/Graphics/TextSprite.hpp | 2 +- include/Nazara/Graphics/TextureBackground.hpp | 2 +- include/Nazara/Graphics/View.hpp | 2 +- include/Nazara/Lua/Config.hpp | 10 + include/Nazara/Lua/Lua.hpp | 3 +- include/Nazara/Lua/LuaInstance.hpp | 3 +- include/Nazara/Noise/Abstract2DNoise.hpp | 2 +- include/Nazara/Noise/Abstract3DNoise.hpp | 2 +- include/Nazara/Noise/Abstract4DNoise.hpp | 2 +- include/Nazara/Noise/ComplexNoiseBase.hpp | 2 +- include/Nazara/Noise/Config.hpp | 10 + include/Nazara/Noise/FBM2D.hpp | 2 +- include/Nazara/Noise/FBM3D.hpp | 2 +- include/Nazara/Noise/FBM4D.hpp | 2 +- include/Nazara/Noise/HybridMultiFractal3D.hpp | 2 +- include/Nazara/Noise/HybridMultiFractal4D.hpp | 2 +- include/Nazara/Noise/HybridMultifractal2D.hpp | 2 +- include/Nazara/Noise/MappedNoiseBase.hpp | 2 +- include/Nazara/Noise/Noise.hpp | 3 +- include/Nazara/Noise/NoiseBase.hpp | 3 +- include/Nazara/Noise/Perlin2D.hpp | 2 +- include/Nazara/Noise/Perlin3D.hpp | 2 +- include/Nazara/Noise/Perlin4D.hpp | 2 +- include/Nazara/Noise/Simplex2D.hpp | 2 +- include/Nazara/Noise/Simplex3D.hpp | 2 +- include/Nazara/Noise/Simplex4D.hpp | 2 +- include/Nazara/Physics/Config.hpp | 10 + include/Nazara/Physics/Geom.hpp | 19 +- include/Nazara/Physics/PhysObject.hpp | 3 +- include/Nazara/Physics/PhysWorld.hpp | 3 +- include/Nazara/Physics/Physics.hpp | 3 +- include/Nazara/Prerequesites.hpp | 16 - include/Nazara/Renderer/Config.hpp | 10 + include/Nazara/Renderer/Context.hpp | 2 +- include/Nazara/Renderer/ContextParameters.hpp | 3 +- include/Nazara/Renderer/DebugDrawer.hpp | 3 +- include/Nazara/Renderer/GpuQuery.hpp | 3 +- include/Nazara/Renderer/OpenGL.hpp | 352 +++++++++--------- include/Nazara/Renderer/RenderBuffer.hpp | 3 +- include/Nazara/Renderer/RenderTarget.hpp | 2 +- include/Nazara/Renderer/RenderTexture.hpp | 2 +- include/Nazara/Renderer/RenderWindow.hpp | 2 +- include/Nazara/Renderer/Renderer.hpp | 2 +- include/Nazara/Renderer/Shader.hpp | 3 +- include/Nazara/Renderer/ShaderStage.hpp | 3 +- include/Nazara/Renderer/Texture.hpp | 3 +- include/Nazara/Renderer/TextureSampler.hpp | 3 +- include/Nazara/Renderer/UberShader.hpp | 2 +- .../Nazara/Renderer/UberShaderInstance.hpp | 2 +- .../UberShaderInstancePreprocessor.hpp | 2 +- .../Renderer/UberShaderPreprocessor.hpp | 2 +- include/Nazara/Utility/AbstractAtlas.hpp | 3 +- include/Nazara/Utility/AbstractBuffer.hpp | 2 +- include/Nazara/Utility/AbstractImage.hpp | 3 +- include/Nazara/Utility/AbstractTextDrawer.hpp | 3 +- include/Nazara/Utility/Algorithm.hpp | 38 +- include/Nazara/Utility/Animation.hpp | 5 +- include/Nazara/Utility/Buffer.hpp | 3 +- include/Nazara/Utility/Config.hpp | 10 + include/Nazara/Utility/Cursor.hpp | 3 +- include/Nazara/Utility/Font.hpp | 4 +- include/Nazara/Utility/FontData.hpp | 3 +- .../Nazara/Utility/Formats/MD5AnimParser.hpp | 2 +- .../Nazara/Utility/Formats/MD5MeshParser.hpp | 2 +- include/Nazara/Utility/Formats/MTLParser.hpp | 3 +- include/Nazara/Utility/Formats/OBJParser.hpp | 3 +- .../Nazara/Utility/GuillotineImageAtlas.hpp | 2 +- include/Nazara/Utility/Icon.hpp | 3 +- include/Nazara/Utility/Image.hpp | 4 +- include/Nazara/Utility/IndexBuffer.hpp | 2 +- include/Nazara/Utility/IndexMapper.hpp | 2 +- include/Nazara/Utility/Joint.hpp | 2 +- include/Nazara/Utility/Joystick.hpp | 2 +- include/Nazara/Utility/Keyboard.hpp | 3 +- include/Nazara/Utility/Mesh.hpp | 4 +- include/Nazara/Utility/Mouse.hpp | 3 +- include/Nazara/Utility/Node.hpp | 3 +- include/Nazara/Utility/PixelFormat.hpp | 5 +- include/Nazara/Utility/SimpleTextDrawer.hpp | 2 +- include/Nazara/Utility/SkeletalMesh.hpp | 2 +- include/Nazara/Utility/Skeleton.hpp | 2 +- include/Nazara/Utility/StaticMesh.hpp | 2 +- include/Nazara/Utility/SubMesh.hpp | 2 +- include/Nazara/Utility/TriangleIterator.hpp | 2 +- include/Nazara/Utility/Utility.hpp | 3 +- include/Nazara/Utility/VertexBuffer.hpp | 2 +- include/Nazara/Utility/VertexDeclaration.hpp | 3 +- include/Nazara/Utility/VertexMapper.hpp | 2 +- include/Nazara/Utility/VideoMode.hpp | 3 +- include/Nazara/Utility/Window.hpp | 2 +- src/Nazara/Physics/Geom.cpp | 2 +- src/Nazara/Utility/Formats/FreeTypeLoader.cpp | 2 +- 196 files changed, 680 insertions(+), 546 deletions(-) diff --git a/build/scripts/module/audio.lua b/build/scripts/module/audio.lua index 5da7dc9ac..af6f30b96 100644 --- a/build/scripts/module/audio.lua +++ b/build/scripts/module/audio.lua @@ -2,6 +2,7 @@ if (not _OPTIONS["united"]) then project "NazaraAudio" end +defines "NAZARA_AUDIO_BUILD" defines "NAZARA_AUDIO_OPENAL" files diff --git a/build/scripts/module/core.lua b/build/scripts/module/core.lua index 763153faa..b99ac038a 100644 --- a/build/scripts/module/core.lua +++ b/build/scripts/module/core.lua @@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then project "NazaraCore" end +defines "NAZARA_CORE_BUILD" + files { "../include/Nazara/Prerequesites.hpp", diff --git a/build/scripts/module/graphics.lua b/build/scripts/module/graphics.lua index 34d33e1d0..d7f038379 100644 --- a/build/scripts/module/graphics.lua +++ b/build/scripts/module/graphics.lua @@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then project "NazaraGraphics" end +defines "NAZARA_GRAPHICS_BUILD" + files { "../include/Nazara/Graphics/**.hpp", diff --git a/build/scripts/module/lua.lua b/build/scripts/module/lua.lua index 934753399..f296ecc65 100644 --- a/build/scripts/module/lua.lua +++ b/build/scripts/module/lua.lua @@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then project "NazaraLua" end +defines "NAZARA_LUA_BUILD" + files { "../include/Nazara/Lua/**.hpp", diff --git a/build/scripts/module/noise.lua b/build/scripts/module/noise.lua index ec1c9a017..1a6fd60f4 100644 --- a/build/scripts/module/noise.lua +++ b/build/scripts/module/noise.lua @@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then project "NazaraNoise" end +defines "NAZARA_NOISE_BUILD" + files { "../include/Nazara/Noise/**.hpp", diff --git a/build/scripts/module/physics.lua b/build/scripts/module/physics.lua index 09deb9c63..fd56cecbb 100644 --- a/build/scripts/module/physics.lua +++ b/build/scripts/module/physics.lua @@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then project "NazaraPhysics" end +defines "NAZARA_PHYSICS_BUILD" + files { "../include/Nazara/Physics/**.hpp", diff --git a/build/scripts/module/renderer.lua b/build/scripts/module/renderer.lua index 0acdb85a4..2601ff197 100644 --- a/build/scripts/module/renderer.lua +++ b/build/scripts/module/renderer.lua @@ -2,6 +2,7 @@ if (not _OPTIONS["united"]) then project "NazaraRenderer" end +defines "NAZARA_RENDERER_BUILD" defines "NAZARA_RENDERER_OPENGL" files diff --git a/build/scripts/module/utility.lua b/build/scripts/module/utility.lua index e6c25021e..661cccc1e 100644 --- a/build/scripts/module/utility.lua +++ b/build/scripts/module/utility.lua @@ -2,6 +2,8 @@ if (not _OPTIONS["united"]) then project "NazaraUtility" end +defines "NAZARA_UTILITY_BUILD" + files { "../include/Nazara/Utility/**.hpp", diff --git a/include/Nazara/Audio/Audio.hpp b/include/Nazara/Audio/Audio.hpp index 2c82bc424..c1dd2f508 100644 --- a/include/Nazara/Audio/Audio.hpp +++ b/include/Nazara/Audio/Audio.hpp @@ -8,12 +8,13 @@ #define NAZARA_AUDIO_HPP #include +#include #include #include #include #include -class NAZARA_API NzAudio +class NAZARA_AUDIO_API NzAudio { public: NzAudio() = delete; diff --git a/include/Nazara/Audio/Config.hpp b/include/Nazara/Audio/Config.hpp index a30e67e3c..e11bda468 100644 --- a/include/Nazara/Audio/Config.hpp +++ b/include/Nazara/Audio/Config.hpp @@ -41,4 +41,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#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 diff --git a/include/Nazara/Audio/Music.hpp b/include/Nazara/Audio/Music.hpp index 2ea35535a..a4d990a29 100644 --- a/include/Nazara/Audio/Music.hpp +++ b/include/Nazara/Audio/Music.hpp @@ -27,7 +27,7 @@ using NzMusicLoader = NzResourceLoader; struct NzMusicImpl; -class NAZARA_API NzMusic : public NzResource, public NzSoundEmitter, NzNonCopyable +class NAZARA_AUDIO_API NzMusic : public NzResource, public NzSoundEmitter, NzNonCopyable { friend NzMusicLoader; diff --git a/include/Nazara/Audio/OpenAL.hpp b/include/Nazara/Audio/OpenAL.hpp index d806e890e..12416c9d4 100644 --- a/include/Nazara/Audio/OpenAL.hpp +++ b/include/Nazara/Audio/OpenAL.hpp @@ -10,6 +10,7 @@ #ifdef NAZARA_AUDIO_OPENAL #include +#include #include #include #include @@ -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 diff --git a/include/Nazara/Audio/Sound.hpp b/include/Nazara/Audio/Sound.hpp index c05e215aa..d875d5460 100644 --- a/include/Nazara/Audio/Sound.hpp +++ b/include/Nazara/Audio/Sound.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzSound : public NzSoundEmitter +class NAZARA_AUDIO_API NzSound : public NzSoundEmitter { public: NzSound() = default; diff --git a/include/Nazara/Audio/SoundBuffer.hpp b/include/Nazara/Audio/SoundBuffer.hpp index d7eb0809d..9fda02538 100644 --- a/include/Nazara/Audio/SoundBuffer.hpp +++ b/include/Nazara/Audio/SoundBuffer.hpp @@ -8,6 +8,7 @@ #define NAZARA_SOUNDBUFFER_HPP #include +#include #include #include #include @@ -37,7 +38,7 @@ using NzSoundBufferRef = NzObjectRef; 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; diff --git a/include/Nazara/Audio/SoundEmitter.hpp b/include/Nazara/Audio/SoundEmitter.hpp index 41b488395..e4e6cf837 100644 --- a/include/Nazara/Audio/SoundEmitter.hpp +++ b/include/Nazara/Audio/SoundEmitter.hpp @@ -8,6 +8,7 @@ #define NAZARA_SOUNDEMITTER_HPP #include +#include #include #include #include @@ -15,7 +16,7 @@ ///TODO: Faire hériter SoundEmitter de Node -class NAZARA_API NzSoundEmitter +class NAZARA_AUDIO_API NzSoundEmitter { public: virtual ~NzSoundEmitter(); diff --git a/include/Nazara/Audio/SoundStream.hpp b/include/Nazara/Audio/SoundStream.hpp index dfb637f59..13def198d 100644 --- a/include/Nazara/Audio/SoundStream.hpp +++ b/include/Nazara/Audio/SoundStream.hpp @@ -8,9 +8,10 @@ #define NAZARA_SOUNDSTREAM_HPP #include +#include #include -class NAZARA_API NzSoundStream +class NAZARA_AUDIO_API NzSoundStream { public: NzSoundStream() = default; diff --git a/include/Nazara/Core/AbstractHash.hpp b/include/Nazara/Core/AbstractHash.hpp index 11ea82906..798d3879a 100644 --- a/include/Nazara/Core/AbstractHash.hpp +++ b/include/Nazara/Core/AbstractHash.hpp @@ -12,7 +12,7 @@ class NzHashDigest; -class NAZARA_API NzAbstractHash : NzNonCopyable +class NAZARA_CORE_API NzAbstractHash : NzNonCopyable { public: NzAbstractHash() = default; diff --git a/include/Nazara/Core/ByteArray.hpp b/include/Nazara/Core/ByteArray.hpp index aba0d0158..68a98d174 100644 --- a/include/Nazara/Core/ByteArray.hpp +++ b/include/Nazara/Core/ByteArray.hpp @@ -15,7 +15,7 @@ class NzAbstractHash; class NzHashDigest; -class NAZARA_API NzByteArray : public NzHashable +class NAZARA_CORE_API NzByteArray : public NzHashable { public: struct SharedArray; @@ -86,7 +86,7 @@ class NAZARA_API NzByteArray : public NzHashable static int Compare(const NzByteArray& first, const NzByteArray& second); - struct NAZARA_API SharedArray + struct NAZARA_CORE_API SharedArray { SharedArray() : refCount(1) @@ -121,7 +121,7 @@ class NAZARA_API NzByteArray : public NzHashable namespace std { - NAZARA_API void swap(NzByteArray& lhs, NzByteArray& rhs); + NAZARA_CORE_API void swap(NzByteArray& lhs, NzByteArray& rhs); } #endif // NAZARA_BYTEARRAY_HPP diff --git a/include/Nazara/Core/Clock.hpp b/include/Nazara/Core/Clock.hpp index 7f4ffc156..8eac3c2db 100644 --- a/include/Nazara/Core/Clock.hpp +++ b/include/Nazara/Core/Clock.hpp @@ -15,7 +15,7 @@ #include #endif -class NAZARA_API NzClock +class NAZARA_CORE_API NzClock { public: NzClock(nzUInt64 startingValue = 0, bool paused = false); @@ -43,7 +43,7 @@ class NAZARA_API NzClock typedef nzUInt64 (*NzClockFunction)(); -extern NAZARA_API NzClockFunction NzGetMicroseconds; -extern NAZARA_API NzClockFunction NzGetMilliseconds; +extern NAZARA_CORE_API NzClockFunction NzGetMicroseconds; +extern NAZARA_CORE_API NzClockFunction NzGetMilliseconds; #endif // NAZARA_CLOCK_HPP diff --git a/include/Nazara/Core/Color.hpp b/include/Nazara/Core/Color.hpp index 7ef42bf7b..6bf4176f5 100644 --- a/include/Nazara/Core/Color.hpp +++ b/include/Nazara/Core/Color.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzColor +class NAZARA_CORE_API NzColor { public: NzColor(); diff --git a/include/Nazara/Core/ConditionVariable.hpp b/include/Nazara/Core/ConditionVariable.hpp index 5e1787cb7..ae97c7c76 100644 --- a/include/Nazara/Core/ConditionVariable.hpp +++ b/include/Nazara/Core/ConditionVariable.hpp @@ -12,7 +12,7 @@ class NzConditionVariableImpl; class NzMutex; -class NAZARA_API NzConditionVariable +class NAZARA_CORE_API NzConditionVariable { public: NzConditionVariable(); diff --git a/include/Nazara/Core/Config.hpp b/include/Nazara/Core/Config.hpp index 3cdc38629..71fe1b974 100644 --- a/include/Nazara/Core/Config.hpp +++ b/include/Nazara/Core/Config.hpp @@ -78,4 +78,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#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 diff --git a/include/Nazara/Core/Core.hpp b/include/Nazara/Core/Core.hpp index 5443e8f2b..7c315fb3f 100644 --- a/include/Nazara/Core/Core.hpp +++ b/include/Nazara/Core/Core.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzCore +class NAZARA_CORE_API NzCore { public: NzCore() = delete; diff --git a/include/Nazara/Core/Debug/NewRedefinition.hpp b/include/Nazara/Core/Debug/NewRedefinition.hpp index b315d7ade..4faf79aa1 100644 --- a/include/Nazara/Core/Debug/NewRedefinition.hpp +++ b/include/Nazara/Core/Debug/NewRedefinition.hpp @@ -13,10 +13,10 @@ #include #include -NAZARA_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_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 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_CORE_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 diff --git a/include/Nazara/Core/Directory.hpp b/include/Nazara/Core/Directory.hpp index b5afb15f0..e145a7aae 100644 --- a/include/Nazara/Core/Directory.hpp +++ b/include/Nazara/Core/Directory.hpp @@ -28,7 +28,7 @@ class NzDirectoryImpl; -class NAZARA_API NzDirectory : NzNonCopyable +class NAZARA_CORE_API NzDirectory : NzNonCopyable { public: NzDirectory(); diff --git a/include/Nazara/Core/DynLib.hpp b/include/Nazara/Core/DynLib.hpp index 733b7c962..14b46ab72 100644 --- a/include/Nazara/Core/DynLib.hpp +++ b/include/Nazara/Core/DynLib.hpp @@ -31,7 +31,7 @@ using NzDynLibFunc = int (*)(); // Type "générique" de pointeur sur fonction class NzDynLibImpl; -class NAZARA_API NzDynLib : NzNonCopyable +class NAZARA_CORE_API NzDynLib : NzNonCopyable { public: NzDynLib(); diff --git a/include/Nazara/Core/Error.hpp b/include/Nazara/Core/Error.hpp index dde4a5100..4253f5881 100644 --- a/include/Nazara/Core/Error.hpp +++ b/include/Nazara/Core/Error.hpp @@ -23,7 +23,7 @@ #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) -class NAZARA_API NzError +class NAZARA_CORE_API NzError { public: NzError() = delete; diff --git a/include/Nazara/Core/ErrorFlags.hpp b/include/Nazara/Core/ErrorFlags.hpp index 714996b4f..6795db107 100644 --- a/include/Nazara/Core/ErrorFlags.hpp +++ b/include/Nazara/Core/ErrorFlags.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzErrorFlags : NzNonCopyable +class NAZARA_CORE_API NzErrorFlags : NzNonCopyable { public: NzErrorFlags(nzUInt32 flags, bool replace = false); diff --git a/include/Nazara/Core/File.hpp b/include/Nazara/Core/File.hpp index 10abc76e3..0a8f21a40 100644 --- a/include/Nazara/Core/File.hpp +++ b/include/Nazara/Core/File.hpp @@ -25,7 +25,7 @@ class NzFileImpl; -class NAZARA_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable +class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable { public: enum CursorPosition diff --git a/include/Nazara/Core/GuillotineBinPack.hpp b/include/Nazara/Core/GuillotineBinPack.hpp index 10aa9ab89..9cbd5ed6b 100644 --- a/include/Nazara/Core/GuillotineBinPack.hpp +++ b/include/Nazara/Core/GuillotineBinPack.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzGuillotineBinPack +class NAZARA_CORE_API NzGuillotineBinPack { public: enum FreeRectChoiceHeuristic : int; diff --git a/include/Nazara/Core/HardwareInfo.hpp b/include/Nazara/Core/HardwareInfo.hpp index 73f0c9eb8..de1409640 100644 --- a/include/Nazara/Core/HardwareInfo.hpp +++ b/include/Nazara/Core/HardwareInfo.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzHardwareInfo +class NAZARA_CORE_API NzHardwareInfo { public: static void Cpuid(nzUInt32 functionId, nzUInt32 subFunctionId, nzUInt32 result[4]); diff --git a/include/Nazara/Core/Hash.hpp b/include/Nazara/Core/Hash.hpp index 2f3f45b7b..7ad150231 100644 --- a/include/Nazara/Core/Hash.hpp +++ b/include/Nazara/Core/Hash.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzHash : NzNonCopyable +class NAZARA_CORE_API NzHash : NzNonCopyable { public: NzHash(nzHash hash); diff --git a/include/Nazara/Core/Hash/CRC32.hpp b/include/Nazara/Core/Hash/CRC32.hpp index 067717e43..04789932e 100644 --- a/include/Nazara/Core/Hash/CRC32.hpp +++ b/include/Nazara/Core/Hash/CRC32.hpp @@ -13,7 +13,7 @@ struct NzHashCRC32_state; -class NAZARA_API NzHashCRC32 : public NzAbstractHash +class NAZARA_CORE_API NzHashCRC32 : public NzAbstractHash { public: NzHashCRC32(nzUInt32 polynomial = 0x04c11db7); diff --git a/include/Nazara/Core/Hash/Fletcher16.hpp b/include/Nazara/Core/Hash/Fletcher16.hpp index cd756477c..bfa594fa9 100644 --- a/include/Nazara/Core/Hash/Fletcher16.hpp +++ b/include/Nazara/Core/Hash/Fletcher16.hpp @@ -14,7 +14,7 @@ struct NzHashFletcher16_state; -class NAZARA_API NzHashFletcher16 : public NzAbstractHash +class NAZARA_CORE_API NzHashFletcher16 : public NzAbstractHash { public: NzHashFletcher16(); diff --git a/include/Nazara/Core/Hash/MD5.hpp b/include/Nazara/Core/Hash/MD5.hpp index a2559c4c3..e398d403d 100644 --- a/include/Nazara/Core/Hash/MD5.hpp +++ b/include/Nazara/Core/Hash/MD5.hpp @@ -13,7 +13,7 @@ struct NzHashMD5_state; -class NAZARA_API NzHashMD5 : public NzAbstractHash +class NAZARA_CORE_API NzHashMD5 : public NzAbstractHash { public: NzHashMD5(); diff --git a/include/Nazara/Core/Hash/SHA1.hpp b/include/Nazara/Core/Hash/SHA1.hpp index 896a5ea45..f02b364de 100644 --- a/include/Nazara/Core/Hash/SHA1.hpp +++ b/include/Nazara/Core/Hash/SHA1.hpp @@ -13,7 +13,7 @@ union SHA_CTX; -class NAZARA_API NzHashSHA1 : public NzAbstractHash +class NAZARA_CORE_API NzHashSHA1 : public NzAbstractHash { public: NzHashSHA1(); diff --git a/include/Nazara/Core/Hash/SHA224.hpp b/include/Nazara/Core/Hash/SHA224.hpp index d65d28328..f98f0ef5c 100644 --- a/include/Nazara/Core/Hash/SHA224.hpp +++ b/include/Nazara/Core/Hash/SHA224.hpp @@ -13,7 +13,7 @@ union SHA_CTX; -class NAZARA_API NzHashSHA224 : public NzAbstractHash +class NAZARA_CORE_API NzHashSHA224 : public NzAbstractHash { public: NzHashSHA224(); diff --git a/include/Nazara/Core/Hash/SHA256.hpp b/include/Nazara/Core/Hash/SHA256.hpp index aa27760ff..0f407a2b2 100644 --- a/include/Nazara/Core/Hash/SHA256.hpp +++ b/include/Nazara/Core/Hash/SHA256.hpp @@ -13,7 +13,7 @@ union SHA_CTX; -class NAZARA_API NzHashSHA256 : public NzAbstractHash +class NAZARA_CORE_API NzHashSHA256 : public NzAbstractHash { public: NzHashSHA256(); diff --git a/include/Nazara/Core/Hash/SHA384.hpp b/include/Nazara/Core/Hash/SHA384.hpp index a07885760..bfd7995b5 100644 --- a/include/Nazara/Core/Hash/SHA384.hpp +++ b/include/Nazara/Core/Hash/SHA384.hpp @@ -13,7 +13,7 @@ union SHA_CTX; -class NAZARA_API NzHashSHA384 : public NzAbstractHash +class NAZARA_CORE_API NzHashSHA384 : public NzAbstractHash { public: NzHashSHA384(); diff --git a/include/Nazara/Core/Hash/SHA512.hpp b/include/Nazara/Core/Hash/SHA512.hpp index 22dd2e968..3e28a7597 100644 --- a/include/Nazara/Core/Hash/SHA512.hpp +++ b/include/Nazara/Core/Hash/SHA512.hpp @@ -13,7 +13,7 @@ union SHA_CTX; -class NAZARA_API NzHashSHA512 : public NzAbstractHash +class NAZARA_CORE_API NzHashSHA512 : public NzAbstractHash { public: NzHashSHA512(); diff --git a/include/Nazara/Core/Hash/Whirlpool.hpp b/include/Nazara/Core/Hash/Whirlpool.hpp index b4970712e..1eacee93f 100644 --- a/include/Nazara/Core/Hash/Whirlpool.hpp +++ b/include/Nazara/Core/Hash/Whirlpool.hpp @@ -11,7 +11,7 @@ struct NzHashWhirlpool_state; -class NAZARA_API NzHashWhirlpool : public NzAbstractHash +class NAZARA_CORE_API NzHashWhirlpool : public NzAbstractHash { public: NzHashWhirlpool(); diff --git a/include/Nazara/Core/HashDigest.hpp b/include/Nazara/Core/HashDigest.hpp index ef0acd151..42d04acf3 100644 --- a/include/Nazara/Core/HashDigest.hpp +++ b/include/Nazara/Core/HashDigest.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzHashDigest +class NAZARA_CORE_API NzHashDigest { public: NzHashDigest(); @@ -42,7 +42,7 @@ class NAZARA_API NzHashDigest 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: NzString m_hashName; diff --git a/include/Nazara/Core/Hashable.hpp b/include/Nazara/Core/Hashable.hpp index 483262622..45f29dab1 100644 --- a/include/Nazara/Core/Hashable.hpp +++ b/include/Nazara/Core/Hashable.hpp @@ -13,7 +13,7 @@ class NzAbstractHash; class NzHashDigest; -class NAZARA_API NzHashable +class NAZARA_CORE_API NzHashable { friend class NzHash; diff --git a/include/Nazara/Core/InputStream.hpp b/include/Nazara/Core/InputStream.hpp index 4db9be523..8b9d31766 100644 --- a/include/Nazara/Core/InputStream.hpp +++ b/include/Nazara/Core/InputStream.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzInputStream : public NzStream +class NAZARA_CORE_API NzInputStream : public NzStream { public: virtual ~NzInputStream(); diff --git a/include/Nazara/Core/LockGuard.hpp b/include/Nazara/Core/LockGuard.hpp index 394f13e2a..409c0ad8c 100644 --- a/include/Nazara/Core/LockGuard.hpp +++ b/include/Nazara/Core/LockGuard.hpp @@ -11,7 +11,7 @@ class NzMutex; -class NAZARA_API NzLockGuard +class NAZARA_CORE_API NzLockGuard { public: NzLockGuard(NzMutex& mutex); diff --git a/include/Nazara/Core/Log.hpp b/include/Nazara/Core/Log.hpp index 458dc1b3d..d2d3f9ad9 100644 --- a/include/Nazara/Core/Log.hpp +++ b/include/Nazara/Core/Log.hpp @@ -29,7 +29,7 @@ class NzFile; -class NAZARA_API NzLog : NzNonCopyable +class NAZARA_CORE_API NzLog : NzNonCopyable { public: void Enable(bool enable); diff --git a/include/Nazara/Core/MemoryManager.hpp b/include/Nazara/Core/MemoryManager.hpp index a3d2d7774..23e9982d9 100644 --- a/include/Nazara/Core/MemoryManager.hpp +++ b/include/Nazara/Core/MemoryManager.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzMemoryManager +class NAZARA_CORE_API NzMemoryManager { public: static void* Allocate(std::size_t size, bool multi = false, const char* file = nullptr, unsigned int line = 0); diff --git a/include/Nazara/Core/MemoryStream.hpp b/include/Nazara/Core/MemoryStream.hpp index 0370d8465..11d9a7827 100644 --- a/include/Nazara/Core/MemoryStream.hpp +++ b/include/Nazara/Core/MemoryStream.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzMemoryStream : public NzInputStream +class NAZARA_CORE_API NzMemoryStream : public NzInputStream { public: NzMemoryStream(const void* ptr, nzUInt64 size); diff --git a/include/Nazara/Core/Mutex.hpp b/include/Nazara/Core/Mutex.hpp index b34341836..07c6f56fb 100644 --- a/include/Nazara/Core/Mutex.hpp +++ b/include/Nazara/Core/Mutex.hpp @@ -12,7 +12,7 @@ class NzMutexImpl; -class NAZARA_API NzMutex : NzNonCopyable +class NAZARA_CORE_API NzMutex : NzNonCopyable { friend class NzConditionVariable; diff --git a/include/Nazara/Core/NonCopyable.hpp b/include/Nazara/Core/NonCopyable.hpp index b6bc2ab2f..e8dec1851 100644 --- a/include/Nazara/Core/NonCopyable.hpp +++ b/include/Nazara/Core/NonCopyable.hpp @@ -9,7 +9,7 @@ #include -class NAZARA_API NzNonCopyable +class NAZARA_CORE_API NzNonCopyable { protected: NzNonCopyable() = default; diff --git a/include/Nazara/Core/ParameterList.hpp b/include/Nazara/Core/ParameterList.hpp index e8c3fb51c..a3dbcb197 100644 --- a/include/Nazara/Core/ParameterList.hpp +++ b/include/Nazara/Core/ParameterList.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzParameterList +class NAZARA_CORE_API NzParameterList { public: using Destructor = void (*)(void* value); diff --git a/include/Nazara/Core/PluginManager.hpp b/include/Nazara/Core/PluginManager.hpp index 57e3f4687..abd1b31e8 100644 --- a/include/Nazara/Core/PluginManager.hpp +++ b/include/Nazara/Core/PluginManager.hpp @@ -17,7 +17,7 @@ class NzDynLib; -class NAZARA_API NzPluginManager +class NAZARA_CORE_API NzPluginManager { public: NzPluginManager() = delete; diff --git a/include/Nazara/Core/PrimitiveList.hpp b/include/Nazara/Core/PrimitiveList.hpp index 8a8b096aa..8d48e8953 100644 --- a/include/Nazara/Core/PrimitiveList.hpp +++ b/include/Nazara/Core/PrimitiveList.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzPrimitiveList +class NAZARA_CORE_API NzPrimitiveList { public: NzPrimitiveList() = default; diff --git a/include/Nazara/Core/RefCounted.hpp b/include/Nazara/Core/RefCounted.hpp index b67fc2c2b..4915a9361 100644 --- a/include/Nazara/Core/RefCounted.hpp +++ b/include/Nazara/Core/RefCounted.hpp @@ -17,7 +17,7 @@ #include #endif -class NAZARA_API NzRefCounted +class NAZARA_CORE_API NzRefCounted { public: NzRefCounted(bool persistent = true); diff --git a/include/Nazara/Core/Resource.hpp b/include/Nazara/Core/Resource.hpp index 5c79cd249..eb852fe86 100644 --- a/include/Nazara/Core/Resource.hpp +++ b/include/Nazara/Core/Resource.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzResource +class NAZARA_CORE_API NzResource { public: NzResource() = default; diff --git a/include/Nazara/Core/Semaphore.hpp b/include/Nazara/Core/Semaphore.hpp index 2dd6f5ef5..6c44cb728 100644 --- a/include/Nazara/Core/Semaphore.hpp +++ b/include/Nazara/Core/Semaphore.hpp @@ -12,7 +12,7 @@ class NzSemaphoreImpl; -class NAZARA_API NzSemaphore : NzNonCopyable +class NAZARA_CORE_API NzSemaphore : NzNonCopyable { public: NzSemaphore(unsigned int count); diff --git a/include/Nazara/Core/Stream.hpp b/include/Nazara/Core/Stream.hpp index fa4aafe12..54c1d5b94 100644 --- a/include/Nazara/Core/Stream.hpp +++ b/include/Nazara/Core/Stream.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzStream +class NAZARA_CORE_API NzStream { public: NzStream() = default; diff --git a/include/Nazara/Core/String.hpp b/include/Nazara/Core/String.hpp index 419f23135..18baf8478 100644 --- a/include/Nazara/Core/String.hpp +++ b/include/Nazara/Core/String.hpp @@ -17,7 +17,7 @@ class NzAbstractHash; class NzHashDigest; -class NAZARA_API NzString : public NzHashable +class NAZARA_CORE_API NzString : public NzHashable { public: enum Flags @@ -261,45 +261,45 @@ class NAZARA_API NzString : public NzHashable static NzString Unicode(const char32_t* u32String); static NzString Unicode(const wchar_t* wString); - NAZARA_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::istream& operator>>(std::istream& in, 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_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+(char character, const NzString& string); + NAZARA_CORE_API friend NzString operator+(const char* 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_API friend bool operator!=(const NzString& first, const NzString& second); - NAZARA_API friend bool operator<(const NzString& first, const NzString& second); - NAZARA_API friend bool operator<=(const NzString& first, const NzString& second); - NAZARA_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_CORE_API friend bool operator!=(const NzString& first, const NzString& second); + NAZARA_CORE_API friend bool operator<(const NzString& first, const NzString& second); + NAZARA_CORE_API friend bool operator<=(const NzString& first, const NzString& second); + NAZARA_CORE_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_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==(char character, const NzString& nstring); + NAZARA_CORE_API friend bool operator==(const char* 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_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!=(char character, const NzString& nstring); + NAZARA_CORE_API friend bool operator!=(const char* 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_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<(char character, const NzString& nstring); + NAZARA_CORE_API friend bool operator<(const char* 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_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<=(char character, const NzString& nstring); + NAZARA_CORE_API friend bool operator<=(const char* 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_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>(char character, const NzString& nstring); + NAZARA_CORE_API friend bool operator>(const char* 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_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>=(char character, const NzString& nstring); + NAZARA_CORE_API friend bool operator>=(const char* 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() : refCount(1) @@ -334,9 +334,9 @@ class NAZARA_API NzString : public NzHashable namespace std { - NAZARA_API istream& getline(istream& is, NzString& str); - NAZARA_API istream& getline(istream& is, NzString& str, char delim); - NAZARA_API void swap(NzString& lhs, NzString& rhs); + NAZARA_CORE_API istream& getline(istream& is, NzString& str); + NAZARA_CORE_API istream& getline(istream& is, NzString& str, char delim); + NAZARA_CORE_API void swap(NzString& lhs, NzString& rhs); } #include diff --git a/include/Nazara/Core/StringStream.hpp b/include/Nazara/Core/StringStream.hpp index c3899f16b..906cdafce 100644 --- a/include/Nazara/Core/StringStream.hpp +++ b/include/Nazara/Core/StringStream.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzStringStream +class NAZARA_CORE_API NzStringStream { public: NzStringStream(); diff --git a/include/Nazara/Core/TaskScheduler.hpp b/include/Nazara/Core/TaskScheduler.hpp index b626f830c..4ce423db7 100644 --- a/include/Nazara/Core/TaskScheduler.hpp +++ b/include/Nazara/Core/TaskScheduler.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzTaskScheduler +class NAZARA_CORE_API NzTaskScheduler { public: NzTaskScheduler() = delete; diff --git a/include/Nazara/Core/Thread.hpp b/include/Nazara/Core/Thread.hpp index 3b5aca7d5..fedf6a14b 100644 --- a/include/Nazara/Core/Thread.hpp +++ b/include/Nazara/Core/Thread.hpp @@ -14,7 +14,7 @@ class NzThreadImpl; -class NAZARA_API NzThread : NzNonCopyable +class NAZARA_CORE_API NzThread : NzNonCopyable { public: class Id; @@ -42,19 +42,19 @@ class NAZARA_API NzThread : NzNonCopyable NzThreadImpl* m_impl; }; -class NAZARA_API NzThread::Id +class NAZARA_CORE_API NzThread::Id { friend NzThread; public: - NAZARA_API friend bool operator==(const Id& lhs, const Id& rhs); - NAZARA_API friend bool operator!=(const Id& lhs, const Id& rhs); - NAZARA_API friend bool operator<(const Id& lhs, const Id& rhs); - NAZARA_API friend bool operator<=(const Id& lhs, const Id& rhs); - NAZARA_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_CORE_API friend bool operator!=(const Id& lhs, const Id& rhs); + NAZARA_CORE_API friend bool operator<(const Id& lhs, const Id& rhs); + NAZARA_CORE_API friend bool operator<=(const Id& lhs, const Id& rhs); + NAZARA_CORE_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: Id(NzThreadImpl* thread); diff --git a/include/Nazara/Core/Updatable.hpp b/include/Nazara/Core/Updatable.hpp index 540754caa..e738cf9a4 100644 --- a/include/Nazara/Core/Updatable.hpp +++ b/include/Nazara/Core/Updatable.hpp @@ -9,7 +9,7 @@ #include -class NAZARA_API NzUpdatable +class NAZARA_CORE_API NzUpdatable { public: NzUpdatable() = default; diff --git a/include/Nazara/Graphics/AbstractBackground.hpp b/include/Nazara/Graphics/AbstractBackground.hpp index e400719ee..9bccde7c7 100644 --- a/include/Nazara/Graphics/AbstractBackground.hpp +++ b/include/Nazara/Graphics/AbstractBackground.hpp @@ -8,11 +8,12 @@ #define NAZARA_ABSTRACTBACKGROUND_HPP #include +#include #include class NzAbstractViewer; -class NAZARA_API NzAbstractBackground +class NAZARA_GRAPHICS_API NzAbstractBackground { public: NzAbstractBackground() = default; diff --git a/include/Nazara/Graphics/AbstractRenderQueue.hpp b/include/Nazara/Graphics/AbstractRenderQueue.hpp index 805c4b5f0..c4d4e070b 100644 --- a/include/Nazara/Graphics/AbstractRenderQueue.hpp +++ b/include/Nazara/Graphics/AbstractRenderQueue.hpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -22,7 +23,7 @@ class NzMaterial; class NzTexture; struct NzMeshData; -class NAZARA_API NzAbstractRenderQueue : NzNonCopyable +class NAZARA_GRAPHICS_API NzAbstractRenderQueue : NzNonCopyable { public: struct DirectionalLight; diff --git a/include/Nazara/Graphics/AbstractRenderTechnique.hpp b/include/Nazara/Graphics/AbstractRenderTechnique.hpp index 8a464b4e3..b85b9bd35 100644 --- a/include/Nazara/Graphics/AbstractRenderTechnique.hpp +++ b/include/Nazara/Graphics/AbstractRenderTechnique.hpp @@ -19,7 +19,7 @@ class NzAbstractViewer; class NzBackground; struct SceneData; -class NAZARA_API NzAbstractRenderTechnique : NzNonCopyable +class NAZARA_GRAPHICS_API NzAbstractRenderTechnique : NzNonCopyable { public: NzAbstractRenderTechnique(); diff --git a/include/Nazara/Graphics/AbstractViewer.hpp b/include/Nazara/Graphics/AbstractViewer.hpp index 65f3868fb..9ca7c7f77 100644 --- a/include/Nazara/Graphics/AbstractViewer.hpp +++ b/include/Nazara/Graphics/AbstractViewer.hpp @@ -8,6 +8,7 @@ #define NAZARA_ABSTRACTVIEWER_HPP #include +#include #include #include #include @@ -16,7 +17,7 @@ class NzRenderTarget; class NzScene; -class NAZARA_API NzAbstractViewer +class NAZARA_GRAPHICS_API NzAbstractViewer { public: NzAbstractViewer() = default; diff --git a/include/Nazara/Graphics/Camera.hpp b/include/Nazara/Graphics/Camera.hpp index 7343e2391..de474bc00 100644 --- a/include/Nazara/Graphics/Camera.hpp +++ b/include/Nazara/Graphics/Camera.hpp @@ -16,7 +16,7 @@ #include #include -class NAZARA_API NzCamera : public NzAbstractViewer, public NzNode +class NAZARA_GRAPHICS_API NzCamera : public NzAbstractViewer, public NzNode { public: NzCamera(); diff --git a/include/Nazara/Graphics/ColorBackground.hpp b/include/Nazara/Graphics/ColorBackground.hpp index acb3c5c32..aa00fd154 100644 --- a/include/Nazara/Graphics/ColorBackground.hpp +++ b/include/Nazara/Graphics/ColorBackground.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzColorBackground : public NzAbstractBackground +class NAZARA_GRAPHICS_API NzColorBackground : public NzAbstractBackground { public: NzColorBackground(const NzColor& color = NzColor::Black); diff --git a/include/Nazara/Graphics/Config.hpp b/include/Nazara/Graphics/Config.hpp index 1a51c5803..77f1669c4 100644 --- a/include/Nazara/Graphics/Config.hpp +++ b/include/Nazara/Graphics/Config.hpp @@ -46,4 +46,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#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 diff --git a/include/Nazara/Graphics/DeferredBloomPass.hpp b/include/Nazara/Graphics/DeferredBloomPass.hpp index 85f770470..3a6aace09 100644 --- a/include/Nazara/Graphics/DeferredBloomPass.hpp +++ b/include/Nazara/Graphics/DeferredBloomPass.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzDeferredBloomPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredBloomPass : public NzDeferredRenderPass { public: NzDeferredBloomPass(); diff --git a/include/Nazara/Graphics/DeferredDOFPass.hpp b/include/Nazara/Graphics/DeferredDOFPass.hpp index b25c21613..9043037cc 100644 --- a/include/Nazara/Graphics/DeferredDOFPass.hpp +++ b/include/Nazara/Graphics/DeferredDOFPass.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzDeferredDOFPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredDOFPass : public NzDeferredRenderPass { public: NzDeferredDOFPass(); diff --git a/include/Nazara/Graphics/DeferredFXAAPass.hpp b/include/Nazara/Graphics/DeferredFXAAPass.hpp index b9ca6f1ea..d4da4d5a0 100644 --- a/include/Nazara/Graphics/DeferredFXAAPass.hpp +++ b/include/Nazara/Graphics/DeferredFXAAPass.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzDeferredFXAAPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredFXAAPass : public NzDeferredRenderPass { public: NzDeferredFXAAPass(); diff --git a/include/Nazara/Graphics/DeferredFinalPass.hpp b/include/Nazara/Graphics/DeferredFinalPass.hpp index 9d97a24c7..d847b59f3 100644 --- a/include/Nazara/Graphics/DeferredFinalPass.hpp +++ b/include/Nazara/Graphics/DeferredFinalPass.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzDeferredFinalPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredFinalPass : public NzDeferredRenderPass { public: NzDeferredFinalPass(); diff --git a/include/Nazara/Graphics/DeferredFogPass.hpp b/include/Nazara/Graphics/DeferredFogPass.hpp index c466e156d..b531f8daa 100644 --- a/include/Nazara/Graphics/DeferredFogPass.hpp +++ b/include/Nazara/Graphics/DeferredFogPass.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzDeferredFogPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredFogPass : public NzDeferredRenderPass { public: NzDeferredFogPass(); diff --git a/include/Nazara/Graphics/DeferredForwardPass.hpp b/include/Nazara/Graphics/DeferredForwardPass.hpp index df0a84589..7f18180ab 100644 --- a/include/Nazara/Graphics/DeferredForwardPass.hpp +++ b/include/Nazara/Graphics/DeferredForwardPass.hpp @@ -12,7 +12,7 @@ class NzForwardRenderTechnique; -class NAZARA_API NzDeferredForwardPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredForwardPass : public NzDeferredRenderPass { public: NzDeferredForwardPass(); diff --git a/include/Nazara/Graphics/DeferredGeometryPass.hpp b/include/Nazara/Graphics/DeferredGeometryPass.hpp index edb5c5c69..403e68e07 100644 --- a/include/Nazara/Graphics/DeferredGeometryPass.hpp +++ b/include/Nazara/Graphics/DeferredGeometryPass.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzDeferredGeometryPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredGeometryPass : public NzDeferredRenderPass { public: NzDeferredGeometryPass(); diff --git a/include/Nazara/Graphics/DeferredPhongLightingPass.hpp b/include/Nazara/Graphics/DeferredPhongLightingPass.hpp index 0c907cb7a..6da596c5e 100644 --- a/include/Nazara/Graphics/DeferredPhongLightingPass.hpp +++ b/include/Nazara/Graphics/DeferredPhongLightingPass.hpp @@ -16,7 +16,7 @@ class NzStaticMesh; -class NAZARA_API NzDeferredPhongLightingPass : public NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredPhongLightingPass : public NzDeferredRenderPass { public: NzDeferredPhongLightingPass(); diff --git a/include/Nazara/Graphics/DeferredRenderPass.hpp b/include/Nazara/Graphics/DeferredRenderPass.hpp index f596110c3..caf9ade70 100644 --- a/include/Nazara/Graphics/DeferredRenderPass.hpp +++ b/include/Nazara/Graphics/DeferredRenderPass.hpp @@ -8,6 +8,7 @@ #define NAZARA_DEFERREDRENDERPASS_HPP #include +#include #include #include #include @@ -20,7 +21,7 @@ class NzRenderTexture; class NzScene; class NzTexture; -class NAZARA_API NzDeferredRenderPass +class NAZARA_GRAPHICS_API NzDeferredRenderPass { friend NzDeferredRenderTechnique; diff --git a/include/Nazara/Graphics/DeferredRenderQueue.hpp b/include/Nazara/Graphics/DeferredRenderQueue.hpp index f013f077e..e2f40112a 100644 --- a/include/Nazara/Graphics/DeferredRenderQueue.hpp +++ b/include/Nazara/Graphics/DeferredRenderQueue.hpp @@ -21,7 +21,7 @@ class NzForwardRenderQueue; -class NAZARA_API NzDeferredRenderQueue : public NzAbstractRenderQueue +class NAZARA_GRAPHICS_API NzDeferredRenderQueue : public NzAbstractRenderQueue { public: NzDeferredRenderQueue(NzForwardRenderQueue* forwardQueue); diff --git a/include/Nazara/Graphics/DeferredRenderTechnique.hpp b/include/Nazara/Graphics/DeferredRenderTechnique.hpp index 143fe48ac..691689df0 100644 --- a/include/Nazara/Graphics/DeferredRenderTechnique.hpp +++ b/include/Nazara/Graphics/DeferredRenderTechnique.hpp @@ -22,7 +22,7 @@ #include #include -class NAZARA_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique +class NAZARA_GRAPHICS_API NzDeferredRenderTechnique : public NzAbstractRenderTechnique { friend class NzGraphics; diff --git a/include/Nazara/Graphics/Drawable.hpp b/include/Nazara/Graphics/Drawable.hpp index 7ccfc936b..2c89b152f 100644 --- a/include/Nazara/Graphics/Drawable.hpp +++ b/include/Nazara/Graphics/Drawable.hpp @@ -8,8 +8,9 @@ #define NAZARA_DRAWABLE_HPP #include +#include -class NAZARA_API NzDrawable +class NAZARA_GRAPHICS_API NzDrawable { public: NzDrawable() = default; diff --git a/include/Nazara/Graphics/ForwardRenderQueue.hpp b/include/Nazara/Graphics/ForwardRenderQueue.hpp index 49013ab83..c4f7c7f60 100644 --- a/include/Nazara/Graphics/ForwardRenderQueue.hpp +++ b/include/Nazara/Graphics/ForwardRenderQueue.hpp @@ -21,7 +21,7 @@ class NzAbstractViewer; -class NAZARA_API NzForwardRenderQueue : public NzAbstractRenderQueue +class NAZARA_GRAPHICS_API NzForwardRenderQueue : public NzAbstractRenderQueue { friend class NzForwardRenderTechnique; diff --git a/include/Nazara/Graphics/ForwardRenderTechnique.hpp b/include/Nazara/Graphics/ForwardRenderTechnique.hpp index c22b7acef..766fd6fc9 100644 --- a/include/Nazara/Graphics/ForwardRenderTechnique.hpp +++ b/include/Nazara/Graphics/ForwardRenderTechnique.hpp @@ -9,13 +9,14 @@ #include #include +#include #include #include #include #include #include -class NAZARA_API NzForwardRenderTechnique : public NzAbstractRenderTechnique +class NAZARA_GRAPHICS_API NzForwardRenderTechnique : public NzAbstractRenderTechnique { public: NzForwardRenderTechnique(); diff --git a/include/Nazara/Graphics/Graphics.hpp b/include/Nazara/Graphics/Graphics.hpp index adba47320..287e36121 100644 --- a/include/Nazara/Graphics/Graphics.hpp +++ b/include/Nazara/Graphics/Graphics.hpp @@ -9,8 +9,9 @@ #include #include +#include -class NAZARA_API NzGraphics +class NAZARA_GRAPHICS_API NzGraphics { public: NzGraphics() = delete; diff --git a/include/Nazara/Graphics/GuillotineTextureAtlas.hpp b/include/Nazara/Graphics/GuillotineTextureAtlas.hpp index fa82c8056..1076dc453 100644 --- a/include/Nazara/Graphics/GuillotineTextureAtlas.hpp +++ b/include/Nazara/Graphics/GuillotineTextureAtlas.hpp @@ -8,9 +8,10 @@ #define NAZARA_GUILLOTINETEXTUREATLAS_HPP #include +#include #include -class NAZARA_API NzGuillotineTextureAtlas : public NzGuillotineImageAtlas +class NAZARA_GRAPHICS_API NzGuillotineTextureAtlas : public NzGuillotineImageAtlas { public: NzGuillotineTextureAtlas() = default; diff --git a/include/Nazara/Graphics/Light.hpp b/include/Nazara/Graphics/Light.hpp index 8a23bf73b..49823f386 100644 --- a/include/Nazara/Graphics/Light.hpp +++ b/include/Nazara/Graphics/Light.hpp @@ -22,7 +22,7 @@ using NzLightConstRef = NzObjectRef; using NzLightLibrary = NzObjectLibrary; using NzLightRef = NzObjectRef; -class NAZARA_API NzLight : public NzRenderable +class NAZARA_GRAPHICS_API NzLight : public NzRenderable { public: NzLight(nzLightType type = nzLightType_Point); diff --git a/include/Nazara/Graphics/Material.hpp b/include/Nazara/Graphics/Material.hpp index 648c778fc..59f8f800a 100644 --- a/include/Nazara/Graphics/Material.hpp +++ b/include/Nazara/Graphics/Material.hpp @@ -17,13 +17,14 @@ #include #include #include +#include #include #include #include #include #include -struct NAZARA_API NzMaterialParams +struct NAZARA_GRAPHICS_API NzMaterialParams { bool loadAlphaMap = true; bool loadDiffuseMap = true; @@ -44,7 +45,7 @@ using NzMaterialLoader = NzResourceLoader; using NzMaterialManager = NzResourceManager; using NzMaterialRef = NzObjectRef; -class NAZARA_API NzMaterial : public NzRefCounted, public NzResource +class NAZARA_GRAPHICS_API NzMaterial : public NzRefCounted, public NzResource { friend NzMaterialLibrary; friend NzMaterialLoader; diff --git a/include/Nazara/Graphics/Model.hpp b/include/Nazara/Graphics/Model.hpp index 4b0d1e1ae..21a3c3e13 100644 --- a/include/Nazara/Graphics/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -14,7 +14,7 @@ #include #include -struct NAZARA_API NzModelParameters +struct NAZARA_GRAPHICS_API NzModelParameters { NzModelParameters(); @@ -31,7 +31,7 @@ using NzModelConstRef = NzObjectRef; using NzModelLoader = NzResourceLoader; using NzModelRef = NzObjectRef; -class NAZARA_API NzModel : public NzRenderable, public NzResource +class NAZARA_GRAPHICS_API NzModel : public NzRenderable, public NzResource { friend NzModelLoader; friend class NzScene; diff --git a/include/Nazara/Graphics/ParticleController.hpp b/include/Nazara/Graphics/ParticleController.hpp index b560569a0..2481f759d 100644 --- a/include/Nazara/Graphics/ParticleController.hpp +++ b/include/Nazara/Graphics/ParticleController.hpp @@ -12,6 +12,7 @@ #include #include #include +#include class NzParticleController; class NzParticleMapper; @@ -21,7 +22,7 @@ using NzParticleControllerConstRef = NzObjectRef; using NzParticleControllerLibrary = NzObjectLibrary; using NzParticleControllerRef = NzObjectRef; -class NAZARA_API NzParticleController : public NzRefCounted +class NAZARA_GRAPHICS_API NzParticleController : public NzRefCounted { friend NzParticleControllerLibrary; friend class NzGraphics; diff --git a/include/Nazara/Graphics/ParticleDeclaration.hpp b/include/Nazara/Graphics/ParticleDeclaration.hpp index d53ef1628..b45e82526 100644 --- a/include/Nazara/Graphics/ParticleDeclaration.hpp +++ b/include/Nazara/Graphics/ParticleDeclaration.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -21,7 +22,7 @@ using NzParticleDeclarationConstRef = NzObjectRef; using NzParticleDeclarationLibrary = NzObjectLibrary; using NzParticleDeclarationRef = NzObjectRef; -class NAZARA_API NzParticleDeclaration : public NzRefCounted +class NAZARA_GRAPHICS_API NzParticleDeclaration : public NzRefCounted { friend NzParticleDeclarationLibrary; friend class NzGraphics; diff --git a/include/Nazara/Graphics/ParticleEmitter.hpp b/include/Nazara/Graphics/ParticleEmitter.hpp index b8bb32deb..47c688ebc 100644 --- a/include/Nazara/Graphics/ParticleEmitter.hpp +++ b/include/Nazara/Graphics/ParticleEmitter.hpp @@ -8,12 +8,13 @@ #define NAZARA_PARTICLEEMITTER_HPP #include +#include #include class NzParticleMapper; class NzParticleSystem; -class NAZARA_API NzParticleEmitter : public NzNode +class NAZARA_GRAPHICS_API NzParticleEmitter : public NzNode { public: NzParticleEmitter(); diff --git a/include/Nazara/Graphics/ParticleGenerator.hpp b/include/Nazara/Graphics/ParticleGenerator.hpp index 1025f4e04..f4a3c22d6 100644 --- a/include/Nazara/Graphics/ParticleGenerator.hpp +++ b/include/Nazara/Graphics/ParticleGenerator.hpp @@ -12,6 +12,7 @@ #include #include #include +#include class NzParticleGenerator; class NzParticleMapper; @@ -21,7 +22,7 @@ using NzParticleGeneratorConstRef = NzObjectRef; using NzParticleGeneratorLibrary = NzObjectLibrary; using NzParticleGeneratorRef = NzObjectRef; -class NAZARA_API NzParticleGenerator : public NzRefCounted +class NAZARA_GRAPHICS_API NzParticleGenerator : public NzRefCounted { friend NzParticleGeneratorLibrary; friend class NzGraphics; diff --git a/include/Nazara/Graphics/ParticleMapper.hpp b/include/Nazara/Graphics/ParticleMapper.hpp index 9fb4e7102..7ac3e6e38 100644 --- a/include/Nazara/Graphics/ParticleMapper.hpp +++ b/include/Nazara/Graphics/ParticleMapper.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzParticleMapper +class NAZARA_GRAPHICS_API NzParticleMapper { public: NzParticleMapper(void* buffer, const NzParticleDeclaration* declaration); diff --git a/include/Nazara/Graphics/ParticleRenderer.hpp b/include/Nazara/Graphics/ParticleRenderer.hpp index 535b3d9c1..fc5d52c51 100644 --- a/include/Nazara/Graphics/ParticleRenderer.hpp +++ b/include/Nazara/Graphics/ParticleRenderer.hpp @@ -12,6 +12,7 @@ #include #include #include +#include class NzAbstractRenderQueue; class NzParticleMapper; @@ -22,7 +23,7 @@ using NzParticleRendererConstRef = NzObjectRef; using NzParticleRendererLibrary = NzObjectLibrary; using NzParticleRendererRef = NzObjectRef; -class NAZARA_API NzParticleRenderer : public NzRefCounted +class NAZARA_GRAPHICS_API NzParticleRenderer : public NzRefCounted { friend NzParticleRendererLibrary; friend class NzGraphics; diff --git a/include/Nazara/Graphics/ParticleSystem.hpp b/include/Nazara/Graphics/ParticleSystem.hpp index d4abb84e6..36f5969c6 100644 --- a/include/Nazara/Graphics/ParticleSystem.hpp +++ b/include/Nazara/Graphics/ParticleSystem.hpp @@ -21,7 +21,7 @@ #include #include -class NAZARA_API NzParticleSystem : public NzSceneNode, NzUpdatable +class NAZARA_GRAPHICS_API NzParticleSystem : public NzSceneNode, NzUpdatable { public: NzParticleSystem(unsigned int maxParticleCount, nzParticleLayout layout); diff --git a/include/Nazara/Graphics/RenderTechniques.hpp b/include/Nazara/Graphics/RenderTechniques.hpp index 0821e3f51..983b69590 100644 --- a/include/Nazara/Graphics/RenderTechniques.hpp +++ b/include/Nazara/Graphics/RenderTechniques.hpp @@ -9,11 +9,12 @@ #include #include +#include #include class NzAbstractRenderTechnique; -class NAZARA_API NzRenderTechniques +class NAZARA_GRAPHICS_API NzRenderTechniques { public: using RenderTechniqueFactory = NzAbstractRenderTechnique* (*)(); diff --git a/include/Nazara/Graphics/Renderable.hpp b/include/Nazara/Graphics/Renderable.hpp index 242e1f021..6c7280d3f 100644 --- a/include/Nazara/Graphics/Renderable.hpp +++ b/include/Nazara/Graphics/Renderable.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,7 @@ using NzRenderableConstRef = NzObjectRef; using NzRenderableLibrary = NzObjectLibrary; using NzRenderableRef = NzObjectRef; -class NAZARA_API NzRenderable : public NzRefCounted +class NAZARA_GRAPHICS_API NzRenderable : public NzRefCounted { public: struct InstanceData; diff --git a/include/Nazara/Graphics/Scene.hpp b/include/Nazara/Graphics/Scene.hpp index 04febb346..b1088fa44 100644 --- a/include/Nazara/Graphics/Scene.hpp +++ b/include/Nazara/Graphics/Scene.hpp @@ -25,7 +25,7 @@ class NzAbstractViewer; class NzNode; class NzSceneNode; -class NAZARA_API NzScene +class NAZARA_GRAPHICS_API NzScene { friend NzSceneNode; diff --git a/include/Nazara/Graphics/SceneNode.hpp b/include/Nazara/Graphics/SceneNode.hpp index d34214137..80768ebb0 100644 --- a/include/Nazara/Graphics/SceneNode.hpp +++ b/include/Nazara/Graphics/SceneNode.hpp @@ -8,6 +8,7 @@ #define NAZARA_SCENENODE_HPP #include +#include #include #include #include @@ -16,7 +17,7 @@ class NzAbstractRenderQueue; class NzScene; -class NAZARA_API NzSceneNode : public NzNode +class NAZARA_GRAPHICS_API NzSceneNode : public NzNode { friend NzScene; diff --git a/include/Nazara/Graphics/SceneRoot.hpp b/include/Nazara/Graphics/SceneRoot.hpp index 60ae329be..7a0465d60 100644 --- a/include/Nazara/Graphics/SceneRoot.hpp +++ b/include/Nazara/Graphics/SceneRoot.hpp @@ -12,7 +12,7 @@ class NzScene; -class NAZARA_API NzSceneRoot : public NzSceneNode +class NAZARA_GRAPHICS_API NzSceneRoot : public NzSceneNode { friend NzScene; diff --git a/include/Nazara/Graphics/SkeletalModel.hpp b/include/Nazara/Graphics/SkeletalModel.hpp index dcc5bd63b..a8b5da497 100644 --- a/include/Nazara/Graphics/SkeletalModel.hpp +++ b/include/Nazara/Graphics/SkeletalModel.hpp @@ -16,7 +16,7 @@ #include #include -struct NAZARA_API NzSkeletalModelParameters : public NzModelParameters +struct NAZARA_GRAPHICS_API NzSkeletalModelParameters : public NzModelParameters { bool loadAnimation = true; NzAnimationParams animation; @@ -28,7 +28,7 @@ class NzSkeletalModel; using NzSkeletalModelLoader = NzResourceLoader; -class NAZARA_API NzSkeletalModel : public NzModel, NzUpdatable +class NAZARA_GRAPHICS_API NzSkeletalModel : public NzModel, NzUpdatable { friend NzSkeletalModelLoader; diff --git a/include/Nazara/Graphics/SkinningManager.hpp b/include/Nazara/Graphics/SkinningManager.hpp index 14b19d92a..c32c011ea 100644 --- a/include/Nazara/Graphics/SkinningManager.hpp +++ b/include/Nazara/Graphics/SkinningManager.hpp @@ -8,12 +8,13 @@ #define NAZARA_SKINNINGMANAGER_HPP #include +#include class NzSkeleton; class NzSkeletalMesh; class NzVertexBuffer; -class NAZARA_API NzSkinningManager +class NAZARA_GRAPHICS_API NzSkinningManager { friend class NzGraphics; diff --git a/include/Nazara/Graphics/SkyboxBackground.hpp b/include/Nazara/Graphics/SkyboxBackground.hpp index 978aa3c51..29a170c79 100644 --- a/include/Nazara/Graphics/SkyboxBackground.hpp +++ b/include/Nazara/Graphics/SkyboxBackground.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzSkyboxBackground : public NzAbstractBackground +class NAZARA_GRAPHICS_API NzSkyboxBackground : public NzAbstractBackground { public: NzSkyboxBackground(); diff --git a/include/Nazara/Graphics/Sprite.hpp b/include/Nazara/Graphics/Sprite.hpp index 4e5a192ba..502254e36 100644 --- a/include/Nazara/Graphics/Sprite.hpp +++ b/include/Nazara/Graphics/Sprite.hpp @@ -13,7 +13,7 @@ #include #include -class NAZARA_API NzSprite : public NzSceneNode +class NAZARA_GRAPHICS_API NzSprite : public NzSceneNode { public: NzSprite(); diff --git a/include/Nazara/Graphics/TextSprite.hpp b/include/Nazara/Graphics/TextSprite.hpp index ae2850e53..fc6a46afb 100644 --- a/include/Nazara/Graphics/TextSprite.hpp +++ b/include/Nazara/Graphics/TextSprite.hpp @@ -22,7 +22,7 @@ using NzTextSpriteConstRef = NzObjectRef; using NzTextSpriteLibrary = NzObjectLibrary; using NzTextSpriteRef = NzObjectRef; -class NAZARA_API NzTextSprite : public NzRenderable +class NAZARA_GRAPHICS_API NzTextSprite : public NzRenderable { public: NzTextSprite(); diff --git a/include/Nazara/Graphics/TextureBackground.hpp b/include/Nazara/Graphics/TextureBackground.hpp index 6f0d6eea4..78e25e2fb 100644 --- a/include/Nazara/Graphics/TextureBackground.hpp +++ b/include/Nazara/Graphics/TextureBackground.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzTextureBackground : public NzAbstractBackground +class NAZARA_GRAPHICS_API NzTextureBackground : public NzAbstractBackground { public: NzTextureBackground(); diff --git a/include/Nazara/Graphics/View.hpp b/include/Nazara/Graphics/View.hpp index 0e4f89a90..0bbf02929 100644 --- a/include/Nazara/Graphics/View.hpp +++ b/include/Nazara/Graphics/View.hpp @@ -16,7 +16,7 @@ #include #include -class NAZARA_API NzView : public NzAbstractViewer, public NzNode +class NAZARA_GRAPHICS_API NzView : public NzAbstractViewer, public NzNode { public: NzView(); diff --git a/include/Nazara/Lua/Config.hpp b/include/Nazara/Lua/Config.hpp index 9e7563345..6536233f6 100644 --- a/include/Nazara/Lua/Config.hpp +++ b/include/Nazara/Lua/Config.hpp @@ -38,4 +38,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#if defined(NAZARA_STATIC) + #define NAZARA_LUA_API +#else + #ifdef NAZARA_LUA_BUILD + #define NAZARA_LUA_API NAZARA_EXPORT + #else + #define NAZARA_LUA_API NAZARA_IMPORT + #endif +#endif + #endif // NAZARA_CONFIG_LUA_HPP diff --git a/include/Nazara/Lua/Lua.hpp b/include/Nazara/Lua/Lua.hpp index 3defd0c5f..632cdc610 100644 --- a/include/Nazara/Lua/Lua.hpp +++ b/include/Nazara/Lua/Lua.hpp @@ -9,8 +9,9 @@ #include #include +#include -class NAZARA_API NzLua +class NAZARA_LUA_API NzLua { public: NzLua() = delete; diff --git a/include/Nazara/Lua/LuaInstance.hpp b/include/Nazara/Lua/LuaInstance.hpp index 042d218f7..56658ebe0 100644 --- a/include/Nazara/Lua/LuaInstance.hpp +++ b/include/Nazara/Lua/LuaInstance.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,7 @@ class NzLuaInstance; using NzLuaCFunction = int (*)(lua_State* state); using NzLuaFunction = std::function; -class NAZARA_API NzLuaInstance : NzNonCopyable +class NAZARA_LUA_API NzLuaInstance : NzNonCopyable { public: NzLuaInstance(); diff --git a/include/Nazara/Noise/Abstract2DNoise.hpp b/include/Nazara/Noise/Abstract2DNoise.hpp index b472c36b3..42b5e5fad 100644 --- a/include/Nazara/Noise/Abstract2DNoise.hpp +++ b/include/Nazara/Noise/Abstract2DNoise.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzAbstract2DNoise : public NzMappedNoiseBase +class NAZARA_NOISE_API NzAbstract2DNoise : public NzMappedNoiseBase { public: virtual ~NzAbstract2DNoise(); diff --git a/include/Nazara/Noise/Abstract3DNoise.hpp b/include/Nazara/Noise/Abstract3DNoise.hpp index f40ec770e..06ee2b9bc 100644 --- a/include/Nazara/Noise/Abstract3DNoise.hpp +++ b/include/Nazara/Noise/Abstract3DNoise.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzAbstract3DNoise : public NzMappedNoiseBase +class NAZARA_NOISE_API NzAbstract3DNoise : public NzMappedNoiseBase { public: virtual ~NzAbstract3DNoise(); diff --git a/include/Nazara/Noise/Abstract4DNoise.hpp b/include/Nazara/Noise/Abstract4DNoise.hpp index a9ba2a8b7..1d137df0d 100644 --- a/include/Nazara/Noise/Abstract4DNoise.hpp +++ b/include/Nazara/Noise/Abstract4DNoise.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzAbstract4DNoise : public NzMappedNoiseBase +class NAZARA_NOISE_API NzAbstract4DNoise : public NzMappedNoiseBase { public: virtual ~NzAbstract4DNoise(); diff --git a/include/Nazara/Noise/ComplexNoiseBase.hpp b/include/Nazara/Noise/ComplexNoiseBase.hpp index 528ab5582..ae4c6daa3 100644 --- a/include/Nazara/Noise/ComplexNoiseBase.hpp +++ b/include/Nazara/Noise/ComplexNoiseBase.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzComplexNoiseBase +class NAZARA_NOISE_API NzComplexNoiseBase { public: NzComplexNoiseBase(); diff --git a/include/Nazara/Noise/Config.hpp b/include/Nazara/Noise/Config.hpp index 29b7c647a..5df2d6dc4 100644 --- a/include/Nazara/Noise/Config.hpp +++ b/include/Nazara/Noise/Config.hpp @@ -38,4 +38,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#if defined(NAZARA_STATIC) + #define NAZARA_NOISE_API +#else + #ifdef NAZARA_NOISE_BUILD + #define NAZARA_NOISE_API NAZARA_EXPORT + #else + #define NAZARA_NOISE_API NAZARA_IMPORT + #endif +#endif + #endif // NAZARA_CONFIG_MODULENAME_HPP diff --git a/include/Nazara/Noise/FBM2D.hpp b/include/Nazara/Noise/FBM2D.hpp index 4ffade2c8..d2fc883fa 100644 --- a/include/Nazara/Noise/FBM2D.hpp +++ b/include/Nazara/Noise/FBM2D.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzFBM2D : public NzAbstract2DNoise, public NzComplexNoiseBase +class NAZARA_NOISE_API NzFBM2D : public NzAbstract2DNoise, public NzComplexNoiseBase { public: NzFBM2D(nzNoises source, unsigned int seed); diff --git a/include/Nazara/Noise/FBM3D.hpp b/include/Nazara/Noise/FBM3D.hpp index 985c0c777..e331581e9 100644 --- a/include/Nazara/Noise/FBM3D.hpp +++ b/include/Nazara/Noise/FBM3D.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzFBM3D : public NzAbstract3DNoise, public NzComplexNoiseBase +class NAZARA_NOISE_API NzFBM3D : public NzAbstract3DNoise, public NzComplexNoiseBase { public: NzFBM3D(nzNoises source, unsigned int seed); diff --git a/include/Nazara/Noise/FBM4D.hpp b/include/Nazara/Noise/FBM4D.hpp index e79f83c4a..2aafe2c40 100644 --- a/include/Nazara/Noise/FBM4D.hpp +++ b/include/Nazara/Noise/FBM4D.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzFBM4D : public NzAbstract4DNoise, public NzComplexNoiseBase +class NAZARA_NOISE_API NzFBM4D : public NzAbstract4DNoise, public NzComplexNoiseBase { public: NzFBM4D(nzNoises source, unsigned int seed); diff --git a/include/Nazara/Noise/HybridMultiFractal3D.hpp b/include/Nazara/Noise/HybridMultiFractal3D.hpp index 615a3b9a1..6fc84c04a 100644 --- a/include/Nazara/Noise/HybridMultiFractal3D.hpp +++ b/include/Nazara/Noise/HybridMultiFractal3D.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzHybridMultiFractal3D : public NzAbstract3DNoise, public NzComplexNoiseBase +class NAZARA_NOISE_API NzHybridMultiFractal3D : public NzAbstract3DNoise, public NzComplexNoiseBase { public: NzHybridMultiFractal3D(nzNoises source, unsigned int seed); diff --git a/include/Nazara/Noise/HybridMultiFractal4D.hpp b/include/Nazara/Noise/HybridMultiFractal4D.hpp index 8d27df096..04ee10f4f 100644 --- a/include/Nazara/Noise/HybridMultiFractal4D.hpp +++ b/include/Nazara/Noise/HybridMultiFractal4D.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzHybridMultiFractal4D : public NzAbstract4DNoise, public NzComplexNoiseBase +class NAZARA_NOISE_API NzHybridMultiFractal4D : public NzAbstract4DNoise, public NzComplexNoiseBase { public: NzHybridMultiFractal4D(nzNoises source, unsigned int seed); diff --git a/include/Nazara/Noise/HybridMultifractal2D.hpp b/include/Nazara/Noise/HybridMultifractal2D.hpp index 9ed2d0b2a..12fac538b 100644 --- a/include/Nazara/Noise/HybridMultifractal2D.hpp +++ b/include/Nazara/Noise/HybridMultifractal2D.hpp @@ -11,7 +11,7 @@ #include #include -class NAZARA_API NzHybridMultiFractal2D : public NzAbstract2DNoise, public NzComplexNoiseBase +class NAZARA_NOISE_API NzHybridMultiFractal2D : public NzAbstract2DNoise, public NzComplexNoiseBase { public: NzHybridMultiFractal2D(nzNoises source, unsigned int seed); diff --git a/include/Nazara/Noise/MappedNoiseBase.hpp b/include/Nazara/Noise/MappedNoiseBase.hpp index 62a1f9fc5..c4b4169f5 100644 --- a/include/Nazara/Noise/MappedNoiseBase.hpp +++ b/include/Nazara/Noise/MappedNoiseBase.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzMappedNoiseBase : public NzNoiseBase +class NAZARA_NOISE_API NzMappedNoiseBase : public NzNoiseBase { public: NzMappedNoiseBase(); diff --git a/include/Nazara/Noise/Noise.hpp b/include/Nazara/Noise/Noise.hpp index ea7cc91a3..c8b954464 100644 --- a/include/Nazara/Noise/Noise.hpp +++ b/include/Nazara/Noise/Noise.hpp @@ -9,8 +9,9 @@ #include #include +#include -class NAZARA_API NzNoise +class NAZARA_NOISE_API NzNoise { public: NzNoise() = delete; diff --git a/include/Nazara/Noise/NoiseBase.hpp b/include/Nazara/Noise/NoiseBase.hpp index 76c2c4315..baa240f9f 100644 --- a/include/Nazara/Noise/NoiseBase.hpp +++ b/include/Nazara/Noise/NoiseBase.hpp @@ -8,6 +8,7 @@ #define NOISEBASE_HPP #include +#include enum nzNoises { @@ -16,7 +17,7 @@ enum nzNoises CELL }; -class NAZARA_API NzNoiseBase +class NAZARA_NOISE_API NzNoiseBase { public: NzNoiseBase(unsigned int seed = 0); diff --git a/include/Nazara/Noise/Perlin2D.hpp b/include/Nazara/Noise/Perlin2D.hpp index e719a3870..a5eaff5e5 100644 --- a/include/Nazara/Noise/Perlin2D.hpp +++ b/include/Nazara/Noise/Perlin2D.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzPerlin2D : public NzAbstract2DNoise +class NAZARA_NOISE_API NzPerlin2D : public NzAbstract2DNoise { public: NzPerlin2D(); diff --git a/include/Nazara/Noise/Perlin3D.hpp b/include/Nazara/Noise/Perlin3D.hpp index e487a49fc..e04713fdd 100644 --- a/include/Nazara/Noise/Perlin3D.hpp +++ b/include/Nazara/Noise/Perlin3D.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzPerlin3D : public NzAbstract3DNoise +class NAZARA_NOISE_API NzPerlin3D : public NzAbstract3DNoise { public: NzPerlin3D(); diff --git a/include/Nazara/Noise/Perlin4D.hpp b/include/Nazara/Noise/Perlin4D.hpp index 90ec5a92e..6abef3ba3 100644 --- a/include/Nazara/Noise/Perlin4D.hpp +++ b/include/Nazara/Noise/Perlin4D.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzPerlin4D : public NzAbstract4DNoise +class NAZARA_NOISE_API NzPerlin4D : public NzAbstract4DNoise { public: NzPerlin4D(); diff --git a/include/Nazara/Noise/Simplex2D.hpp b/include/Nazara/Noise/Simplex2D.hpp index 8b44a5a11..232a730ea 100644 --- a/include/Nazara/Noise/Simplex2D.hpp +++ b/include/Nazara/Noise/Simplex2D.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzSimplex2D : public NzAbstract2DNoise +class NAZARA_NOISE_API NzSimplex2D : public NzAbstract2DNoise { public: NzSimplex2D(); diff --git a/include/Nazara/Noise/Simplex3D.hpp b/include/Nazara/Noise/Simplex3D.hpp index b2257c063..5ca1bd425 100644 --- a/include/Nazara/Noise/Simplex3D.hpp +++ b/include/Nazara/Noise/Simplex3D.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzSimplex3D : public NzAbstract3DNoise +class NAZARA_NOISE_API NzSimplex3D : public NzAbstract3DNoise { public: NzSimplex3D(); diff --git a/include/Nazara/Noise/Simplex4D.hpp b/include/Nazara/Noise/Simplex4D.hpp index 3415e16cb..81d134e6f 100644 --- a/include/Nazara/Noise/Simplex4D.hpp +++ b/include/Nazara/Noise/Simplex4D.hpp @@ -12,7 +12,7 @@ #include #include -class NAZARA_API NzSimplex4D : public NzAbstract4DNoise +class NAZARA_NOISE_API NzSimplex4D : public NzAbstract4DNoise { public: NzSimplex4D(); diff --git a/include/Nazara/Physics/Config.hpp b/include/Nazara/Physics/Config.hpp index 06d30e383..b57e39378 100644 --- a/include/Nazara/Physics/Config.hpp +++ b/include/Nazara/Physics/Config.hpp @@ -38,4 +38,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#if defined(NAZARA_STATIC) + #define NAZARA_PHYSICS_API +#else + #ifdef NAZARA_PHYSICS_BUILD + #define NAZARA_PHYSICS_API NAZARA_EXPORT + #else + #define NAZARA_PHYSICS_API NAZARA_IMPORT + #endif +#endif + #endif // NAZARA_CONFIG_PHYSICS_HPP diff --git a/include/Nazara/Physics/Geom.hpp b/include/Nazara/Physics/Geom.hpp index 5f3a79f27..67c849798 100644 --- a/include/Nazara/Physics/Geom.hpp +++ b/include/Nazara/Physics/Geom.hpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -34,7 +35,7 @@ using NzPhysGeomConstRef = NzObjectRef; using NzPhysGeomLibrary = NzObjectLibrary; using NzPhysGeomRef = NzObjectRef; -class NAZARA_API NzPhysGeom : public NzRefCounted, NzNonCopyable +class NAZARA_PHYSICS_API NzPhysGeom : public NzRefCounted, NzNonCopyable { public: NzPhysGeom() = default; @@ -65,7 +66,7 @@ class NzBoxGeom; using NzBoxGeomConstRef = NzObjectRef; using NzBoxGeomRef = NzObjectRef; -class NAZARA_API NzBoxGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzBoxGeom : public NzPhysGeom { public: NzBoxGeom(const NzVector3f& lengths, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity()); @@ -91,7 +92,7 @@ class NzCapsuleGeom; using NzCapsuleGeomConstRef = NzObjectRef; using NzCapsuleGeomRef = NzObjectRef; -class NAZARA_API NzCapsuleGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzCapsuleGeom : public NzPhysGeom { public: NzCapsuleGeom(float length, float radius, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity()); @@ -116,7 +117,7 @@ class NzCompoundGeom; using NzCompoundGeomConstRef = NzObjectRef; using NzCompoundGeomRef = NzObjectRef; -class NAZARA_API NzCompoundGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzCompoundGeom : public NzPhysGeom { public: NzCompoundGeom(NzPhysGeom** geoms, unsigned int geomCount); @@ -137,7 +138,7 @@ class NzConeGeom; using NzConeGeomConstRef = NzObjectRef; using NzConeGeomRef = NzObjectRef; -class NAZARA_API NzConeGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzConeGeom : public NzPhysGeom { public: NzConeGeom(float length, float radius, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity()); @@ -162,7 +163,7 @@ class NzConvexHullGeom; using NzConvexHullGeomConstRef = NzObjectRef; using NzConvexHullGeomRef = NzObjectRef; -class NAZARA_API NzConvexHullGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzConvexHullGeom : public NzPhysGeom { public: NzConvexHullGeom(const void* vertices, unsigned int vertexCount, unsigned int stride = sizeof(NzVector3f), float tolerance = 0.002f, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity()); @@ -186,7 +187,7 @@ class NzCylinderGeom; using NzCylinderGeomConstRef = NzObjectRef; using NzCylinderGeomRef = NzObjectRef; -class NAZARA_API NzCylinderGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzCylinderGeom : public NzPhysGeom { public: NzCylinderGeom(float length, float radius, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity()); @@ -211,7 +212,7 @@ class NzNullGeom; using NzNullGeomConstRef = NzObjectRef; using NzNullGeomRef = NzObjectRef; -class NAZARA_API NzNullGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzNullGeom : public NzPhysGeom { public: NzNullGeom(); @@ -229,7 +230,7 @@ class NzSphereGeom; using NzSphereGeomConstRef = NzObjectRef; using NzSphereGeomRef = NzObjectRef; -class NAZARA_API NzSphereGeom : public NzPhysGeom +class NAZARA_PHYSICS_API NzSphereGeom : public NzPhysGeom { public: NzSphereGeom(float radius, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity()); diff --git a/include/Nazara/Physics/PhysObject.hpp b/include/Nazara/Physics/PhysObject.hpp index e2cf7f82e..3ee1f2a4c 100644 --- a/include/Nazara/Physics/PhysObject.hpp +++ b/include/Nazara/Physics/PhysObject.hpp @@ -13,12 +13,13 @@ #include #include #include +#include #include class NzPhysWorld; struct NewtonBody; -class NAZARA_API NzPhysObject +class NAZARA_PHYSICS_API NzPhysObject { public: NzPhysObject(NzPhysWorld* world, const NzMatrix4f& mat = NzMatrix4f::Identity()); diff --git a/include/Nazara/Physics/PhysWorld.hpp b/include/Nazara/Physics/PhysWorld.hpp index 7069ff412..ed54d5106 100644 --- a/include/Nazara/Physics/PhysWorld.hpp +++ b/include/Nazara/Physics/PhysWorld.hpp @@ -11,10 +11,11 @@ #include #include #include +#include struct NewtonWorld; -class NAZARA_API NzPhysWorld : NzNonCopyable +class NAZARA_PHYSICS_API NzPhysWorld : NzNonCopyable { public: NzPhysWorld(); diff --git a/include/Nazara/Physics/Physics.hpp b/include/Nazara/Physics/Physics.hpp index 9fa7649a9..f418a9d55 100644 --- a/include/Nazara/Physics/Physics.hpp +++ b/include/Nazara/Physics/Physics.hpp @@ -9,8 +9,9 @@ #include #include +#include -class NAZARA_API NzPhysics +class NAZARA_PHYSICS_API NzPhysics { public: NzPhysics() = delete; diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp index 1d4f7ee9f..e3fa117f1 100644 --- a/include/Nazara/Prerequesites.hpp +++ b/include/Nazara/Prerequesites.hpp @@ -87,16 +87,6 @@ #define NAZARA_EXPORT __declspec(dllexport) #define NAZARA_IMPORT __declspec(dllimport) - #if !defined(NAZARA_STATIC) - #ifdef NAZARA_BUILD - #define NAZARA_API NAZARA_EXPORT - #else - #define NAZARA_API NAZARA_IMPORT - #endif - #else - #define NAZARA_API - #endif - // Des defines pour le header Windows #if defined(NAZARA_BUILD) // Pour ne pas entrer en conflit avec les defines de l'application ou d'une autre bibliothèque #ifndef WIN32_LEAN_AND_MEAN @@ -130,12 +120,6 @@ #define NAZARA_EXPORT __attribute__((visibility ("default"))) #define NAZARA_IMPORT __attribute__((visibility ("default"))) - - #if !defined(NAZARA_STATIC) && defined(NAZARA_COMPILER_GCC) - #define NAZARA_API NAZARA_EXPORT - #else - #define NAZARA_API - #endif /*#elif defined(__APPLE__) && defined(__MACH__) #define NAZARA_API #define NAZARA_PLATFORM_MACOSX diff --git a/include/Nazara/Renderer/Config.hpp b/include/Nazara/Renderer/Config.hpp index eb9bf3d7f..f4458216f 100644 --- a/include/Nazara/Renderer/Config.hpp +++ b/include/Nazara/Renderer/Config.hpp @@ -44,4 +44,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#if defined(NAZARA_STATIC) + #define NAZARA_RENDERER_API +#else + #ifdef NAZARA_RENDERER_BUILD + #define NAZARA_RENDERER_API NAZARA_EXPORT + #else + #define NAZARA_RENDERER_API NAZARA_IMPORT + #endif +#endif + #endif // NAZARA_CONFIG_MODULENAME_HPP diff --git a/include/Nazara/Renderer/Context.hpp b/include/Nazara/Renderer/Context.hpp index da4a67d88..2e59ba110 100644 --- a/include/Nazara/Renderer/Context.hpp +++ b/include/Nazara/Renderer/Context.hpp @@ -24,7 +24,7 @@ using NzContextRef = NzObjectRef; class NzContextImpl; -class NAZARA_API NzContext : public NzRefCounted +class NAZARA_RENDERER_API NzContext : public NzRefCounted { friend NzContextImpl; friend NzContextLibrary; diff --git a/include/Nazara/Renderer/ContextParameters.hpp b/include/Nazara/Renderer/ContextParameters.hpp index 5e344778c..f4c5eea80 100644 --- a/include/Nazara/Renderer/ContextParameters.hpp +++ b/include/Nazara/Renderer/ContextParameters.hpp @@ -7,13 +7,14 @@ #ifndef NAZARA_CONTEXTPARAMETERS_HPP #define NAZARA_CONTEXTPARAMETERS_HPP +#include #include #include #include class NzContext; -struct NAZARA_API NzContextParameters +struct NAZARA_RENDERER_API NzContextParameters { NzContextParameters(const NzRenderTargetParameters& parameters = NzRenderTargetParameters()) : antialiasingLevel(parameters.antialiasingLevel), diff --git a/include/Nazara/Renderer/DebugDrawer.hpp b/include/Nazara/Renderer/DebugDrawer.hpp index cb1ae2953..9563f0511 100644 --- a/include/Nazara/Renderer/DebugDrawer.hpp +++ b/include/Nazara/Renderer/DebugDrawer.hpp @@ -13,11 +13,12 @@ #include #include #include +#include #include class NzSkeleton; -class NAZARA_API NzDebugDrawer +class NAZARA_RENDERER_API NzDebugDrawer { public: static void Draw(const NzBoundingVolumef& volume); diff --git a/include/Nazara/Renderer/GpuQuery.hpp b/include/Nazara/Renderer/GpuQuery.hpp index bd792b979..25b21eed3 100644 --- a/include/Nazara/Renderer/GpuQuery.hpp +++ b/include/Nazara/Renderer/GpuQuery.hpp @@ -9,9 +9,10 @@ #include #include +#include #include -class NAZARA_API NzGpuQuery : NzNonCopyable +class NAZARA_RENDERER_API NzGpuQuery : NzNonCopyable { public: NzGpuQuery(); diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp index 08079582a..021252677 100644 --- a/include/Nazara/Renderer/OpenGL.hpp +++ b/include/Nazara/Renderer/OpenGL.hpp @@ -52,7 +52,7 @@ class NzRenderTarget; using NzOpenGLFunc = void (*)(); -class NAZARA_API NzOpenGL +class NAZARA_RENDERER_API NzOpenGL { friend NzContext; @@ -156,183 +156,183 @@ class NAZARA_API NzOpenGL static void OnContextDestruction(const NzContext* context); }; -NAZARA_API extern PFNGLACTIVETEXTUREPROC glActiveTexture; -NAZARA_API extern PFNGLATTACHSHADERPROC glAttachShader; -NAZARA_API extern PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender; -NAZARA_API extern PFNGLBEGINQUERYPROC glBeginQuery; -NAZARA_API extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation; -NAZARA_API extern PFNGLBINDBUFFERPROC glBindBuffer; -NAZARA_API extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; -NAZARA_API extern PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation; -NAZARA_API extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; -NAZARA_API extern PFNGLBINDSAMPLERPROC glBindSampler; -NAZARA_API extern PFNGLBINDTEXTUREPROC glBindTexture; -NAZARA_API extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray; -NAZARA_API extern PFNGLBLENDFUNCPROC glBlendFunc; -NAZARA_API extern PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; -NAZARA_API extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer; -NAZARA_API extern PFNGLBUFFERDATAPROC glBufferData; -NAZARA_API extern PFNGLBUFFERSUBDATAPROC glBufferSubData; -NAZARA_API extern PFNGLCLEARPROC glClear; -NAZARA_API extern PFNGLCLEARCOLORPROC glClearColor; -NAZARA_API extern PFNGLCLEARDEPTHPROC glClearDepth; -NAZARA_API extern PFNGLCLEARSTENCILPROC glClearStencil; -NAZARA_API extern PFNGLCREATEPROGRAMPROC glCreateProgram; -NAZARA_API extern PFNGLCREATESHADERPROC glCreateShader; -NAZARA_API extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; -NAZARA_API extern PFNGLCOLORMASKPROC glColorMask; -NAZARA_API extern PFNGLCULLFACEPROC glCullFace; -NAZARA_API extern PFNGLCOMPILESHADERPROC glCompileShader; -NAZARA_API extern PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D; -NAZARA_API extern PFNGLDEBUGMESSAGECALLBACKPROC glDebugMessageCallback; -NAZARA_API extern PFNGLDEBUGMESSAGECONTROLPROC glDebugMessageControl; -NAZARA_API extern PFNGLDEBUGMESSAGEINSERTPROC glDebugMessageInsert; -NAZARA_API extern PFNGLDELETEBUFFERSPROC glDeleteBuffers; -NAZARA_API extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; -NAZARA_API extern PFNGLDELETEPROGRAMPROC glDeleteProgram; -NAZARA_API extern PFNGLDELETEQUERIESPROC glDeleteQueries; -NAZARA_API extern PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers; -NAZARA_API extern PFNGLDELETESAMPLERSPROC glDeleteSamplers; -NAZARA_API extern PFNGLDELETESHADERPROC glDeleteShader; -NAZARA_API extern PFNGLDELETETEXTURESPROC glDeleteTextures; -NAZARA_API extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays; -NAZARA_API extern PFNGLDEPTHFUNCPROC glDepthFunc; -NAZARA_API extern PFNGLDEPTHMASKPROC glDepthMask; -NAZARA_API extern PFNGLDISABLEPROC glDisable; -NAZARA_API extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray; -NAZARA_API extern PFNGLDRAWARRAYSPROC glDrawArrays; -NAZARA_API extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced; -NAZARA_API extern PFNGLDRAWBUFFERPROC glDrawBuffer; -NAZARA_API extern PFNGLDRAWBUFFERSPROC glDrawBuffers; -NAZARA_API extern PFNGLDRAWELEMENTSPROC glDrawElements; -NAZARA_API extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced; -NAZARA_API extern PFNGLDRAWTEXTURENVPROC glDrawTexture; -NAZARA_API extern PFNGLENABLEPROC glEnable; -NAZARA_API extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray; -NAZARA_API extern PFNGLENDCONDITIONALRENDERPROC glEndConditionalRender; -NAZARA_API extern PFNGLENDQUERYPROC glEndQuery; -NAZARA_API extern PFNGLFLUSHPROC glFlush; -NAZARA_API extern PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer; -NAZARA_API extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture; -NAZARA_API extern PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D; -NAZARA_API extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; -NAZARA_API extern PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D; -NAZARA_API extern PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer; -NAZARA_API extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap; -NAZARA_API extern PFNGLGENBUFFERSPROC glGenBuffers; -NAZARA_API extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; -NAZARA_API extern PFNGLGENQUERIESPROC glGenQueries; -NAZARA_API extern PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; -NAZARA_API extern PFNGLGENSAMPLERSPROC glGenSamplers; -NAZARA_API extern PFNGLGENTEXTURESPROC glGenTextures; -NAZARA_API extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays; -NAZARA_API extern PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform; -NAZARA_API extern PFNGLGETBOOLEANVPROC glGetBooleanv; -NAZARA_API extern PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv; -NAZARA_API extern PFNGLGETDEBUGMESSAGELOGPROC glGetDebugMessageLog; -NAZARA_API extern PFNGLGETERRORPROC glGetError; -NAZARA_API extern PFNGLGETFLOATVPROC glGetFloatv; -NAZARA_API extern PFNGLGETINTEGERVPROC glGetIntegerv; -NAZARA_API extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary; -NAZARA_API extern PFNGLGETPROGRAMIVPROC glGetProgramiv; -NAZARA_API extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog; -NAZARA_API extern PFNGLGETQUERYIVPROC glGetQueryiv; -NAZARA_API extern PFNGLGETQUERYOBJECTIVPROC glGetQueryObjectiv; -NAZARA_API extern PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv; -NAZARA_API extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog; -NAZARA_API extern PFNGLGETSHADERIVPROC glGetShaderiv; -NAZARA_API extern PFNGLGETSHADERSOURCEPROC glGetShaderSource; -NAZARA_API extern PFNGLGETSTRINGPROC glGetString; -NAZARA_API extern PFNGLGETSTRINGIPROC glGetStringi; -NAZARA_API extern PFNGLGETTEXIMAGEPROC glGetTexImage; -NAZARA_API extern PFNGLGETTEXLEVELPARAMETERFVPROC glGetTexLevelParameterfv; -NAZARA_API extern PFNGLGETTEXLEVELPARAMETERIVPROC glGetTexLevelParameteriv; -NAZARA_API extern PFNGLGETTEXPARAMETERFVPROC glGetTexParameterfv; -NAZARA_API extern PFNGLGETTEXPARAMETERIVPROC glGetTexParameteriv; -NAZARA_API extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation; -NAZARA_API extern PFNGLINVALIDATEBUFFERDATAPROC glInvalidateBufferData; -NAZARA_API extern PFNGLISENABLEDPROC glIsEnabled; -NAZARA_API extern PFNGLLINEWIDTHPROC glLineWidth; -NAZARA_API extern PFNGLLINKPROGRAMPROC glLinkProgram; -NAZARA_API extern PFNGLMAPBUFFERPROC glMapBuffer; -NAZARA_API extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange; -NAZARA_API extern PFNGLPIXELSTOREIPROC glPixelStorei; -NAZARA_API extern PFNGLPOINTSIZEPROC glPointSize; -NAZARA_API extern PFNGLPOLYGONMODEPROC glPolygonMode; -NAZARA_API extern PFNGLPROGRAMBINARYPROC glProgramBinary; -NAZARA_API extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri; -NAZARA_API extern PFNGLPROGRAMUNIFORM1DPROC glProgramUniform1d; -NAZARA_API extern PFNGLPROGRAMUNIFORM1FPROC glProgramUniform1f; -NAZARA_API extern PFNGLPROGRAMUNIFORM1IPROC glProgramUniform1i; -NAZARA_API extern PFNGLPROGRAMUNIFORM1DVPROC glProgramUniform1dv; -NAZARA_API extern PFNGLPROGRAMUNIFORM1FVPROC glProgramUniform1fv; -NAZARA_API extern PFNGLPROGRAMUNIFORM1IVPROC glProgramUniform1iv; -NAZARA_API extern PFNGLPROGRAMUNIFORM2DVPROC glProgramUniform2dv; -NAZARA_API extern PFNGLPROGRAMUNIFORM2FVPROC glProgramUniform2fv; -NAZARA_API extern PFNGLPROGRAMUNIFORM2IVPROC glProgramUniform2iv; -NAZARA_API extern PFNGLPROGRAMUNIFORM3DVPROC glProgramUniform3dv; -NAZARA_API extern PFNGLPROGRAMUNIFORM3FVPROC glProgramUniform3fv; -NAZARA_API extern PFNGLPROGRAMUNIFORM3IVPROC glProgramUniform3iv; -NAZARA_API extern PFNGLPROGRAMUNIFORM4DVPROC glProgramUniform4dv; -NAZARA_API extern PFNGLPROGRAMUNIFORM4FVPROC glProgramUniform4fv; -NAZARA_API extern PFNGLPROGRAMUNIFORM4IVPROC glProgramUniform4iv; -NAZARA_API extern PFNGLPROGRAMUNIFORMMATRIX4DVPROC glProgramUniformMatrix4dv; -NAZARA_API extern PFNGLPROGRAMUNIFORMMATRIX4FVPROC glProgramUniformMatrix4fv; -NAZARA_API extern PFNGLREADPIXELSPROC glReadPixels; -NAZARA_API extern PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; -NAZARA_API extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf; -NAZARA_API extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri; -NAZARA_API extern PFNGLSCISSORPROC glScissor; -NAZARA_API extern PFNGLSHADERSOURCEPROC glShaderSource; -NAZARA_API extern PFNGLSTENCILFUNCPROC glStencilFunc; -NAZARA_API extern PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate; -NAZARA_API extern PFNGLSTENCILOPPROC glStencilOp; -NAZARA_API extern PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate; -NAZARA_API extern PFNGLTEXIMAGE1DPROC glTexImage1D; -NAZARA_API extern PFNGLTEXIMAGE2DPROC glTexImage2D; -NAZARA_API extern PFNGLTEXIMAGE3DPROC glTexImage3D; -NAZARA_API extern PFNGLTEXPARAMETERFPROC glTexParameterf; -NAZARA_API extern PFNGLTEXPARAMETERIPROC glTexParameteri; -NAZARA_API extern PFNGLTEXSTORAGE1DPROC glTexStorage1D; -NAZARA_API extern PFNGLTEXSTORAGE2DPROC glTexStorage2D; -NAZARA_API extern PFNGLTEXSTORAGE3DPROC glTexStorage3D; -NAZARA_API extern PFNGLTEXSUBIMAGE1DPROC glTexSubImage1D; -NAZARA_API extern PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D; -NAZARA_API extern PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D; -NAZARA_API extern PFNGLUNIFORM1DPROC glUniform1d; -NAZARA_API extern PFNGLUNIFORM1FPROC glUniform1f; -NAZARA_API extern PFNGLUNIFORM1IPROC glUniform1i; -NAZARA_API extern PFNGLUNIFORM1DVPROC glUniform1dv; -NAZARA_API extern PFNGLUNIFORM1FVPROC glUniform1fv; -NAZARA_API extern PFNGLUNIFORM1IVPROC glUniform1iv; -NAZARA_API extern PFNGLUNIFORM2DVPROC glUniform2dv; -NAZARA_API extern PFNGLUNIFORM2FVPROC glUniform2fv; -NAZARA_API extern PFNGLUNIFORM2IVPROC glUniform2iv; -NAZARA_API extern PFNGLUNIFORM3DVPROC glUniform3dv; -NAZARA_API extern PFNGLUNIFORM3FVPROC glUniform3fv; -NAZARA_API extern PFNGLUNIFORM3IVPROC glUniform3iv; -NAZARA_API extern PFNGLUNIFORM4DVPROC glUniform4dv; -NAZARA_API extern PFNGLUNIFORM4FVPROC glUniform4fv; -NAZARA_API extern PFNGLUNIFORM4IVPROC glUniform4iv; -NAZARA_API extern PFNGLUNIFORMMATRIX4DVPROC glUniformMatrix4dv; -NAZARA_API extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv; -NAZARA_API extern PFNGLUNMAPBUFFERPROC glUnmapBuffer; -NAZARA_API extern PFNGLUSEPROGRAMPROC glUseProgram; -NAZARA_API extern PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f; -NAZARA_API extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor; -NAZARA_API extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; -NAZARA_API extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer; -NAZARA_API extern PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer; -NAZARA_API extern PFNGLVIEWPORTPROC glViewport; +NAZARA_RENDERER_API extern PFNGLACTIVETEXTUREPROC glActiveTexture; +NAZARA_RENDERER_API extern PFNGLATTACHSHADERPROC glAttachShader; +NAZARA_RENDERER_API extern PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender; +NAZARA_RENDERER_API extern PFNGLBEGINQUERYPROC glBeginQuery; +NAZARA_RENDERER_API extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation; +NAZARA_RENDERER_API extern PFNGLBINDBUFFERPROC glBindBuffer; +NAZARA_RENDERER_API extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer; +NAZARA_RENDERER_API extern PFNGLBINDFRAGDATALOCATIONPROC glBindFragDataLocation; +NAZARA_RENDERER_API extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer; +NAZARA_RENDERER_API extern PFNGLBINDSAMPLERPROC glBindSampler; +NAZARA_RENDERER_API extern PFNGLBINDTEXTUREPROC glBindTexture; +NAZARA_RENDERER_API extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray; +NAZARA_RENDERER_API extern PFNGLBLENDFUNCPROC glBlendFunc; +NAZARA_RENDERER_API extern PFNGLBLENDFUNCSEPARATEPROC glBlendFuncSeparate; +NAZARA_RENDERER_API extern PFNGLBLITFRAMEBUFFERPROC glBlitFramebuffer; +NAZARA_RENDERER_API extern PFNGLBUFFERDATAPROC glBufferData; +NAZARA_RENDERER_API extern PFNGLBUFFERSUBDATAPROC glBufferSubData; +NAZARA_RENDERER_API extern PFNGLCLEARPROC glClear; +NAZARA_RENDERER_API extern PFNGLCLEARCOLORPROC glClearColor; +NAZARA_RENDERER_API extern PFNGLCLEARDEPTHPROC glClearDepth; +NAZARA_RENDERER_API extern PFNGLCLEARSTENCILPROC glClearStencil; +NAZARA_RENDERER_API extern PFNGLCREATEPROGRAMPROC glCreateProgram; +NAZARA_RENDERER_API extern PFNGLCREATESHADERPROC glCreateShader; +NAZARA_RENDERER_API extern PFNGLCHECKFRAMEBUFFERSTATUSPROC glCheckFramebufferStatus; +NAZARA_RENDERER_API extern PFNGLCOLORMASKPROC glColorMask; +NAZARA_RENDERER_API extern PFNGLCULLFACEPROC glCullFace; +NAZARA_RENDERER_API extern PFNGLCOMPILESHADERPROC glCompileShader; +NAZARA_RENDERER_API extern PFNGLCOPYTEXSUBIMAGE2DPROC glCopyTexSubImage2D; +NAZARA_RENDERER_API extern PFNGLDEBUGMESSAGECALLBACKPROC glDebugMessageCallback; +NAZARA_RENDERER_API extern PFNGLDEBUGMESSAGECONTROLPROC glDebugMessageControl; +NAZARA_RENDERER_API extern PFNGLDEBUGMESSAGEINSERTPROC glDebugMessageInsert; +NAZARA_RENDERER_API extern PFNGLDELETEBUFFERSPROC glDeleteBuffers; +NAZARA_RENDERER_API extern PFNGLDELETEFRAMEBUFFERSPROC glDeleteFramebuffers; +NAZARA_RENDERER_API extern PFNGLDELETEPROGRAMPROC glDeleteProgram; +NAZARA_RENDERER_API extern PFNGLDELETEQUERIESPROC glDeleteQueries; +NAZARA_RENDERER_API extern PFNGLDELETERENDERBUFFERSPROC glDeleteRenderbuffers; +NAZARA_RENDERER_API extern PFNGLDELETESAMPLERSPROC glDeleteSamplers; +NAZARA_RENDERER_API extern PFNGLDELETESHADERPROC glDeleteShader; +NAZARA_RENDERER_API extern PFNGLDELETETEXTURESPROC glDeleteTextures; +NAZARA_RENDERER_API extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays; +NAZARA_RENDERER_API extern PFNGLDEPTHFUNCPROC glDepthFunc; +NAZARA_RENDERER_API extern PFNGLDEPTHMASKPROC glDepthMask; +NAZARA_RENDERER_API extern PFNGLDISABLEPROC glDisable; +NAZARA_RENDERER_API extern PFNGLDISABLEVERTEXATTRIBARRAYPROC glDisableVertexAttribArray; +NAZARA_RENDERER_API extern PFNGLDRAWARRAYSPROC glDrawArrays; +NAZARA_RENDERER_API extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced; +NAZARA_RENDERER_API extern PFNGLDRAWBUFFERPROC glDrawBuffer; +NAZARA_RENDERER_API extern PFNGLDRAWBUFFERSPROC glDrawBuffers; +NAZARA_RENDERER_API extern PFNGLDRAWELEMENTSPROC glDrawElements; +NAZARA_RENDERER_API extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced; +NAZARA_RENDERER_API extern PFNGLDRAWTEXTURENVPROC glDrawTexture; +NAZARA_RENDERER_API extern PFNGLENABLEPROC glEnable; +NAZARA_RENDERER_API extern PFNGLENABLEVERTEXATTRIBARRAYPROC glEnableVertexAttribArray; +NAZARA_RENDERER_API extern PFNGLENDCONDITIONALRENDERPROC glEndConditionalRender; +NAZARA_RENDERER_API extern PFNGLENDQUERYPROC glEndQuery; +NAZARA_RENDERER_API extern PFNGLFLUSHPROC glFlush; +NAZARA_RENDERER_API extern PFNGLFRAMEBUFFERRENDERBUFFERPROC glFramebufferRenderbuffer; +NAZARA_RENDERER_API extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture; +NAZARA_RENDERER_API extern PFNGLFRAMEBUFFERTEXTURE1DPROC glFramebufferTexture1D; +NAZARA_RENDERER_API extern PFNGLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D; +NAZARA_RENDERER_API extern PFNGLFRAMEBUFFERTEXTURE3DPROC glFramebufferTexture3D; +NAZARA_RENDERER_API extern PFNGLFRAMEBUFFERTEXTURELAYERPROC glFramebufferTextureLayer; +NAZARA_RENDERER_API extern PFNGLGENERATEMIPMAPPROC glGenerateMipmap; +NAZARA_RENDERER_API extern PFNGLGENBUFFERSPROC glGenBuffers; +NAZARA_RENDERER_API extern PFNGLGENFRAMEBUFFERSPROC glGenFramebuffers; +NAZARA_RENDERER_API extern PFNGLGENQUERIESPROC glGenQueries; +NAZARA_RENDERER_API extern PFNGLGENRENDERBUFFERSPROC glGenRenderbuffers; +NAZARA_RENDERER_API extern PFNGLGENSAMPLERSPROC glGenSamplers; +NAZARA_RENDERER_API extern PFNGLGENTEXTURESPROC glGenTextures; +NAZARA_RENDERER_API extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays; +NAZARA_RENDERER_API extern PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform; +NAZARA_RENDERER_API extern PFNGLGETBOOLEANVPROC glGetBooleanv; +NAZARA_RENDERER_API extern PFNGLGETBUFFERPARAMETERIVPROC glGetBufferParameteriv; +NAZARA_RENDERER_API extern PFNGLGETDEBUGMESSAGELOGPROC glGetDebugMessageLog; +NAZARA_RENDERER_API extern PFNGLGETERRORPROC glGetError; +NAZARA_RENDERER_API extern PFNGLGETFLOATVPROC glGetFloatv; +NAZARA_RENDERER_API extern PFNGLGETINTEGERVPROC glGetIntegerv; +NAZARA_RENDERER_API extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary; +NAZARA_RENDERER_API extern PFNGLGETPROGRAMIVPROC glGetProgramiv; +NAZARA_RENDERER_API extern PFNGLGETPROGRAMINFOLOGPROC glGetProgramInfoLog; +NAZARA_RENDERER_API extern PFNGLGETQUERYIVPROC glGetQueryiv; +NAZARA_RENDERER_API extern PFNGLGETQUERYOBJECTIVPROC glGetQueryObjectiv; +NAZARA_RENDERER_API extern PFNGLGETQUERYOBJECTUIVPROC glGetQueryObjectuiv; +NAZARA_RENDERER_API extern PFNGLGETSHADERINFOLOGPROC glGetShaderInfoLog; +NAZARA_RENDERER_API extern PFNGLGETSHADERIVPROC glGetShaderiv; +NAZARA_RENDERER_API extern PFNGLGETSHADERSOURCEPROC glGetShaderSource; +NAZARA_RENDERER_API extern PFNGLGETSTRINGPROC glGetString; +NAZARA_RENDERER_API extern PFNGLGETSTRINGIPROC glGetStringi; +NAZARA_RENDERER_API extern PFNGLGETTEXIMAGEPROC glGetTexImage; +NAZARA_RENDERER_API extern PFNGLGETTEXLEVELPARAMETERFVPROC glGetTexLevelParameterfv; +NAZARA_RENDERER_API extern PFNGLGETTEXLEVELPARAMETERIVPROC glGetTexLevelParameteriv; +NAZARA_RENDERER_API extern PFNGLGETTEXPARAMETERFVPROC glGetTexParameterfv; +NAZARA_RENDERER_API extern PFNGLGETTEXPARAMETERIVPROC glGetTexParameteriv; +NAZARA_RENDERER_API extern PFNGLGETUNIFORMLOCATIONPROC glGetUniformLocation; +NAZARA_RENDERER_API extern PFNGLINVALIDATEBUFFERDATAPROC glInvalidateBufferData; +NAZARA_RENDERER_API extern PFNGLISENABLEDPROC glIsEnabled; +NAZARA_RENDERER_API extern PFNGLLINEWIDTHPROC glLineWidth; +NAZARA_RENDERER_API extern PFNGLLINKPROGRAMPROC glLinkProgram; +NAZARA_RENDERER_API extern PFNGLMAPBUFFERPROC glMapBuffer; +NAZARA_RENDERER_API extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange; +NAZARA_RENDERER_API extern PFNGLPIXELSTOREIPROC glPixelStorei; +NAZARA_RENDERER_API extern PFNGLPOINTSIZEPROC glPointSize; +NAZARA_RENDERER_API extern PFNGLPOLYGONMODEPROC glPolygonMode; +NAZARA_RENDERER_API extern PFNGLPROGRAMBINARYPROC glProgramBinary; +NAZARA_RENDERER_API extern PFNGLPROGRAMPARAMETERIPROC glProgramParameteri; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM1DPROC glProgramUniform1d; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM1FPROC glProgramUniform1f; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM1IPROC glProgramUniform1i; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM1DVPROC glProgramUniform1dv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM1FVPROC glProgramUniform1fv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM1IVPROC glProgramUniform1iv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM2DVPROC glProgramUniform2dv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM2FVPROC glProgramUniform2fv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM2IVPROC glProgramUniform2iv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM3DVPROC glProgramUniform3dv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM3FVPROC glProgramUniform3fv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM3IVPROC glProgramUniform3iv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM4DVPROC glProgramUniform4dv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM4FVPROC glProgramUniform4fv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORM4IVPROC glProgramUniform4iv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORMMATRIX4DVPROC glProgramUniformMatrix4dv; +NAZARA_RENDERER_API extern PFNGLPROGRAMUNIFORMMATRIX4FVPROC glProgramUniformMatrix4fv; +NAZARA_RENDERER_API extern PFNGLREADPIXELSPROC glReadPixels; +NAZARA_RENDERER_API extern PFNGLRENDERBUFFERSTORAGEPROC glRenderbufferStorage; +NAZARA_RENDERER_API extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf; +NAZARA_RENDERER_API extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri; +NAZARA_RENDERER_API extern PFNGLSCISSORPROC glScissor; +NAZARA_RENDERER_API extern PFNGLSHADERSOURCEPROC glShaderSource; +NAZARA_RENDERER_API extern PFNGLSTENCILFUNCPROC glStencilFunc; +NAZARA_RENDERER_API extern PFNGLSTENCILFUNCSEPARATEPROC glStencilFuncSeparate; +NAZARA_RENDERER_API extern PFNGLSTENCILOPPROC glStencilOp; +NAZARA_RENDERER_API extern PFNGLSTENCILOPSEPARATEPROC glStencilOpSeparate; +NAZARA_RENDERER_API extern PFNGLTEXIMAGE1DPROC glTexImage1D; +NAZARA_RENDERER_API extern PFNGLTEXIMAGE2DPROC glTexImage2D; +NAZARA_RENDERER_API extern PFNGLTEXIMAGE3DPROC glTexImage3D; +NAZARA_RENDERER_API extern PFNGLTEXPARAMETERFPROC glTexParameterf; +NAZARA_RENDERER_API extern PFNGLTEXPARAMETERIPROC glTexParameteri; +NAZARA_RENDERER_API extern PFNGLTEXSTORAGE1DPROC glTexStorage1D; +NAZARA_RENDERER_API extern PFNGLTEXSTORAGE2DPROC glTexStorage2D; +NAZARA_RENDERER_API extern PFNGLTEXSTORAGE3DPROC glTexStorage3D; +NAZARA_RENDERER_API extern PFNGLTEXSUBIMAGE1DPROC glTexSubImage1D; +NAZARA_RENDERER_API extern PFNGLTEXSUBIMAGE2DPROC glTexSubImage2D; +NAZARA_RENDERER_API extern PFNGLTEXSUBIMAGE3DPROC glTexSubImage3D; +NAZARA_RENDERER_API extern PFNGLUNIFORM1DPROC glUniform1d; +NAZARA_RENDERER_API extern PFNGLUNIFORM1FPROC glUniform1f; +NAZARA_RENDERER_API extern PFNGLUNIFORM1IPROC glUniform1i; +NAZARA_RENDERER_API extern PFNGLUNIFORM1DVPROC glUniform1dv; +NAZARA_RENDERER_API extern PFNGLUNIFORM1FVPROC glUniform1fv; +NAZARA_RENDERER_API extern PFNGLUNIFORM1IVPROC glUniform1iv; +NAZARA_RENDERER_API extern PFNGLUNIFORM2DVPROC glUniform2dv; +NAZARA_RENDERER_API extern PFNGLUNIFORM2FVPROC glUniform2fv; +NAZARA_RENDERER_API extern PFNGLUNIFORM2IVPROC glUniform2iv; +NAZARA_RENDERER_API extern PFNGLUNIFORM3DVPROC glUniform3dv; +NAZARA_RENDERER_API extern PFNGLUNIFORM3FVPROC glUniform3fv; +NAZARA_RENDERER_API extern PFNGLUNIFORM3IVPROC glUniform3iv; +NAZARA_RENDERER_API extern PFNGLUNIFORM4DVPROC glUniform4dv; +NAZARA_RENDERER_API extern PFNGLUNIFORM4FVPROC glUniform4fv; +NAZARA_RENDERER_API extern PFNGLUNIFORM4IVPROC glUniform4iv; +NAZARA_RENDERER_API extern PFNGLUNIFORMMATRIX4DVPROC glUniformMatrix4dv; +NAZARA_RENDERER_API extern PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv; +NAZARA_RENDERER_API extern PFNGLUNMAPBUFFERPROC glUnmapBuffer; +NAZARA_RENDERER_API extern PFNGLUSEPROGRAMPROC glUseProgram; +NAZARA_RENDERER_API extern PFNGLVERTEXATTRIB4FPROC glVertexAttrib4f; +NAZARA_RENDERER_API extern PFNGLVERTEXATTRIBDIVISORPROC glVertexAttribDivisor; +NAZARA_RENDERER_API extern PFNGLVERTEXATTRIBPOINTERPROC glVertexAttribPointer; +NAZARA_RENDERER_API extern PFNGLVERTEXATTRIBIPOINTERPROC glVertexAttribIPointer; +NAZARA_RENDERER_API extern PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer; +NAZARA_RENDERER_API extern PFNGLVIEWPORTPROC glViewport; #if defined(NAZARA_PLATFORM_WINDOWS) -NAZARA_API extern PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormat; -NAZARA_API extern PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribs; -NAZARA_API extern PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB; -NAZARA_API extern PFNWGLGETEXTENSIONSSTRINGEXTPROC wglGetExtensionsStringEXT; -NAZARA_API extern PFNWGLSWAPINTERVALEXTPROC wglSwapInterval; +NAZARA_RENDERER_API extern PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormat; +NAZARA_RENDERER_API extern PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribs; +NAZARA_RENDERER_API extern PFNWGLGETEXTENSIONSSTRINGARBPROC wglGetExtensionsStringARB; +NAZARA_RENDERER_API extern PFNWGLGETEXTENSIONSSTRINGEXTPROC wglGetExtensionsStringEXT; +NAZARA_RENDERER_API extern PFNWGLSWAPINTERVALEXTPROC wglSwapInterval; #elif defined(NAZARA_PLATFORM_LINUX) -NAZARA_API extern PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs; -NAZARA_API extern PFNGLXSWAPINTERVALSGIPROC glXSwapInterval; +NAZARA_RENDERER_API extern PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs; +NAZARA_RENDERER_API extern PFNGLXSWAPINTERVALSGIPROC glXSwapInterval; #endif #endif // NAZARA_RENDERER_OPENGL diff --git a/include/Nazara/Renderer/RenderBuffer.hpp b/include/Nazara/Renderer/RenderBuffer.hpp index 1cf177be1..d02458d7e 100644 --- a/include/Nazara/Renderer/RenderBuffer.hpp +++ b/include/Nazara/Renderer/RenderBuffer.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include class NzRenderBuffer; @@ -21,7 +22,7 @@ using NzRenderBufferConstRef = NzObjectRef; using NzRenderBufferLibrary = NzObjectLibrary; using NzRenderBufferRef = NzObjectRef; -class NAZARA_API NzRenderBuffer : public NzRefCounted, NzNonCopyable +class NAZARA_RENDERER_API NzRenderBuffer : public NzRefCounted, NzNonCopyable { friend NzRenderBufferLibrary; friend class NzRenderer; diff --git a/include/Nazara/Renderer/RenderTarget.hpp b/include/Nazara/Renderer/RenderTarget.hpp index cbce568d9..52806b2aa 100644 --- a/include/Nazara/Renderer/RenderTarget.hpp +++ b/include/Nazara/Renderer/RenderTarget.hpp @@ -15,7 +15,7 @@ class NzRenderer; -class NAZARA_API NzRenderTarget +class NAZARA_RENDERER_API NzRenderTarget { friend class NzRenderer; diff --git a/include/Nazara/Renderer/RenderTexture.hpp b/include/Nazara/Renderer/RenderTexture.hpp index 194ae4cc1..1856d012b 100644 --- a/include/Nazara/Renderer/RenderTexture.hpp +++ b/include/Nazara/Renderer/RenderTexture.hpp @@ -23,7 +23,7 @@ class NzTexture; struct NzRenderTextureImpl; -class NAZARA_API NzRenderTexture : public NzRenderTarget, NzNonCopyable +class NAZARA_RENDERER_API NzRenderTexture : public NzRenderTarget, NzNonCopyable { public: NzRenderTexture() = default; diff --git a/include/Nazara/Renderer/RenderWindow.hpp b/include/Nazara/Renderer/RenderWindow.hpp index 9f0a74fd8..05d1c0163 100644 --- a/include/Nazara/Renderer/RenderWindow.hpp +++ b/include/Nazara/Renderer/RenderWindow.hpp @@ -24,7 +24,7 @@ class NzContext; class NzTexture; struct NzContextParameters; -class NAZARA_API NzRenderWindow : public NzRenderTarget, public NzWindow +class NAZARA_RENDERER_API NzRenderWindow : public NzRenderTarget, public NzWindow { public: NzRenderWindow() = default; diff --git a/include/Nazara/Renderer/Renderer.hpp b/include/Nazara/Renderer/Renderer.hpp index 615647231..be4aa56c6 100644 --- a/include/Nazara/Renderer/Renderer.hpp +++ b/include/Nazara/Renderer/Renderer.hpp @@ -26,7 +26,7 @@ class NzShader; class NzTexture; class NzVertexBuffer; -class NAZARA_API NzRenderer +class NAZARA_RENDERER_API NzRenderer { friend NzTexture; diff --git a/include/Nazara/Renderer/Shader.hpp b/include/Nazara/Renderer/Shader.hpp index e34eeaeea..951f01a51 100644 --- a/include/Nazara/Renderer/Shader.hpp +++ b/include/Nazara/Renderer/Shader.hpp @@ -20,6 +20,7 @@ #include #include #include +#include #include class NzShader; @@ -29,7 +30,7 @@ using NzShaderConstRef = NzObjectRef; using NzShaderLibrary = NzObjectLibrary; using NzShaderRef = NzObjectRef; -class NAZARA_API NzShader : public NzRefCounted, NzNonCopyable +class NAZARA_RENDERER_API NzShader : public NzRefCounted, NzNonCopyable { friend NzShaderLibrary; friend class NzRenderer; diff --git a/include/Nazara/Renderer/ShaderStage.hpp b/include/Nazara/Renderer/ShaderStage.hpp index adb1f7f2c..ef3ba4053 100644 --- a/include/Nazara/Renderer/ShaderStage.hpp +++ b/include/Nazara/Renderer/ShaderStage.hpp @@ -10,9 +10,10 @@ #include #include #include +#include #include -class NAZARA_API NzShaderStage : NzNonCopyable +class NAZARA_RENDERER_API NzShaderStage : NzNonCopyable { public: NzShaderStage(); diff --git a/include/Nazara/Renderer/Texture.hpp b/include/Nazara/Renderer/Texture.hpp index ccd710ee6..f12cb74c6 100644 --- a/include/Nazara/Renderer/Texture.hpp +++ b/include/Nazara/Renderer/Texture.hpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -29,7 +30,7 @@ using NzTextureRef = NzObjectRef; struct NzTextureImpl; -class NAZARA_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource, NzNonCopyable +class NAZARA_RENDERER_API NzTexture : public NzAbstractImage, public NzRefCounted, public NzResource, NzNonCopyable { friend NzTextureLibrary; friend NzTextureManager; diff --git a/include/Nazara/Renderer/TextureSampler.hpp b/include/Nazara/Renderer/TextureSampler.hpp index 6eefb8793..e0b771282 100644 --- a/include/Nazara/Renderer/TextureSampler.hpp +++ b/include/Nazara/Renderer/TextureSampler.hpp @@ -8,11 +8,12 @@ #define NAZARA_TEXTURESAMPLER_HPP #include +#include #include class NzTexture; -class NAZARA_API NzTextureSampler +class NAZARA_RENDERER_API NzTextureSampler { friend class NzRenderer; diff --git a/include/Nazara/Renderer/UberShader.hpp b/include/Nazara/Renderer/UberShader.hpp index aabe20bed..7663e0e17 100644 --- a/include/Nazara/Renderer/UberShader.hpp +++ b/include/Nazara/Renderer/UberShader.hpp @@ -21,7 +21,7 @@ using NzUberShaderConstRef = NzObjectRef; using NzUberShaderLibrary = NzObjectLibrary; using NzUberShaderRef = NzObjectRef; -class NAZARA_API NzUberShader : public NzRefCounted +class NAZARA_RENDERER_API NzUberShader : public NzRefCounted { friend NzUberShaderLibrary; friend class NzRenderer; diff --git a/include/Nazara/Renderer/UberShaderInstance.hpp b/include/Nazara/Renderer/UberShaderInstance.hpp index c42020d19..d531d1926 100644 --- a/include/Nazara/Renderer/UberShaderInstance.hpp +++ b/include/Nazara/Renderer/UberShaderInstance.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzUberShaderInstance +class NAZARA_RENDERER_API NzUberShaderInstance { public: NzUberShaderInstance(const NzShader* shader); diff --git a/include/Nazara/Renderer/UberShaderInstancePreprocessor.hpp b/include/Nazara/Renderer/UberShaderInstancePreprocessor.hpp index 2bbeb8d49..7ba324aaf 100644 --- a/include/Nazara/Renderer/UberShaderInstancePreprocessor.hpp +++ b/include/Nazara/Renderer/UberShaderInstancePreprocessor.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzUberShaderInstancePreprocessor : public NzUberShaderInstance +class NAZARA_RENDERER_API NzUberShaderInstancePreprocessor : public NzUberShaderInstance { public: NzUberShaderInstancePreprocessor(const NzShader* shader); diff --git a/include/Nazara/Renderer/UberShaderPreprocessor.hpp b/include/Nazara/Renderer/UberShaderPreprocessor.hpp index 42a33cfbe..eeae1ffdc 100644 --- a/include/Nazara/Renderer/UberShaderPreprocessor.hpp +++ b/include/Nazara/Renderer/UberShaderPreprocessor.hpp @@ -21,7 +21,7 @@ class NzUberShaderPreprocessor; using NzUberShaderPreprocessorConstRef = NzObjectRef; using NzUberShaderPreprocessorRef = NzObjectRef; -class NAZARA_API NzUberShaderPreprocessor : public NzUberShader +class NAZARA_RENDERER_API NzUberShaderPreprocessor : public NzUberShader { public: NzUberShaderPreprocessor() = default; diff --git a/include/Nazara/Utility/AbstractAtlas.hpp b/include/Nazara/Utility/AbstractAtlas.hpp index 31f316b03..4c73a916e 100644 --- a/include/Nazara/Utility/AbstractAtlas.hpp +++ b/include/Nazara/Utility/AbstractAtlas.hpp @@ -11,13 +11,14 @@ #include #include #include +#include #include #include class NzAbstractImage; class NzImage; -class NAZARA_API NzAbstractAtlas +class NAZARA_UTILITY_API NzAbstractAtlas { public: NzAbstractAtlas() = default; diff --git a/include/Nazara/Utility/AbstractBuffer.hpp b/include/Nazara/Utility/AbstractBuffer.hpp index bb05c2cca..dfa0a27bb 100644 --- a/include/Nazara/Utility/AbstractBuffer.hpp +++ b/include/Nazara/Utility/AbstractBuffer.hpp @@ -9,7 +9,7 @@ #include -class NAZARA_API NzAbstractBuffer +class NAZARA_UTILITY_API NzAbstractBuffer { public: NzAbstractBuffer() = default; diff --git a/include/Nazara/Utility/AbstractImage.hpp b/include/Nazara/Utility/AbstractImage.hpp index 8697ea813..bf8a08573 100644 --- a/include/Nazara/Utility/AbstractImage.hpp +++ b/include/Nazara/Utility/AbstractImage.hpp @@ -11,9 +11,10 @@ #include #include #include +#include #include -class NAZARA_API NzAbstractImage +class NAZARA_UTILITY_API NzAbstractImage { public: NzAbstractImage() = default; diff --git a/include/Nazara/Utility/AbstractTextDrawer.hpp b/include/Nazara/Utility/AbstractTextDrawer.hpp index 76df09a00..3f888bde2 100644 --- a/include/Nazara/Utility/AbstractTextDrawer.hpp +++ b/include/Nazara/Utility/AbstractTextDrawer.hpp @@ -11,11 +11,12 @@ #include #include #include +#include class NzAbstractImage; class NzFont; -class NAZARA_API NzAbstractTextDrawer +class NAZARA_UTILITY_API NzAbstractTextDrawer { public: struct Glyph; diff --git a/include/Nazara/Utility/Algorithm.hpp b/include/Nazara/Utility/Algorithm.hpp index c3e0cc9e0..3d3f3b72e 100644 --- a/include/Nazara/Utility/Algorithm.hpp +++ b/include/Nazara/Utility/Algorithm.hpp @@ -32,28 +32,28 @@ struct NzVertexPointers NzSparsePtr uvPtr; }; -NAZARA_API NzBoxf NzComputeAABB(NzSparsePtr positionPtr, unsigned int vertexCount); -NAZARA_API void NzComputeBoxIndexVertexCount(const NzVector3ui& subdivision, unsigned int* indexCount, unsigned int* vertexCount); -NAZARA_API unsigned int NzComputeCacheMissCount(NzIndexIterator indices, unsigned int indexCount); -NAZARA_API void NzComputeConeIndexVertexCount(unsigned int subdivision, unsigned int* indexCount, unsigned int* vertexCount); -NAZARA_API void NzComputeCubicSphereIndexVertexCount(unsigned int subdivision, unsigned int* indexCount, unsigned int* vertexCount); -NAZARA_API void NzComputeIcoSphereIndexVertexCount(unsigned int recursionLevel, unsigned int* indexCount, unsigned int* vertexCount); -NAZARA_API void NzComputePlaneIndexVertexCount(const NzVector2ui& subdivision, unsigned int* indexCount, unsigned int* vertexCount); -NAZARA_API void NzComputeUvSphereIndexVertexCount(unsigned int sliceCount, unsigned int stackCount, unsigned int* indexCount, unsigned int* vertexCount); +NAZARA_UTILITY_API NzBoxf NzComputeAABB(NzSparsePtr positionPtr, unsigned int vertexCount); +NAZARA_UTILITY_API void NzComputeBoxIndexVertexCount(const NzVector3ui& subdivision, unsigned int* indexCount, unsigned int* vertexCount); +NAZARA_UTILITY_API unsigned int NzComputeCacheMissCount(NzIndexIterator indices, unsigned int indexCount); +NAZARA_UTILITY_API void NzComputeConeIndexVertexCount(unsigned int subdivision, unsigned int* indexCount, unsigned int* vertexCount); +NAZARA_UTILITY_API void NzComputeCubicSphereIndexVertexCount(unsigned int subdivision, unsigned int* indexCount, unsigned int* vertexCount); +NAZARA_UTILITY_API void NzComputeIcoSphereIndexVertexCount(unsigned int recursionLevel, unsigned int* indexCount, unsigned int* vertexCount); +NAZARA_UTILITY_API void NzComputePlaneIndexVertexCount(const NzVector2ui& subdivision, unsigned int* indexCount, unsigned int* vertexCount); +NAZARA_UTILITY_API void NzComputeUvSphereIndexVertexCount(unsigned int sliceCount, unsigned int stackCount, unsigned int* indexCount, unsigned int* vertexCount); -NAZARA_API void NzGenerateBox(const NzVector3f& lengths, const NzVector3ui& subdivision, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); -NAZARA_API void NzGenerateCone(float length, float radius, unsigned int subdivision, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); -NAZARA_API void NzGenerateCubicSphere(float size, unsigned int subdivision, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); -NAZARA_API void NzGenerateIcoSphere(float size, unsigned int recursionLevel, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); -NAZARA_API void NzGeneratePlane(const NzVector2ui& subdivision, const NzVector2f& size, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); -NAZARA_API void NzGenerateUvSphere(float size, unsigned int sliceCount, unsigned int stackCount, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); +NAZARA_UTILITY_API void NzGenerateBox(const NzVector3f& lengths, const NzVector3ui& subdivision, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); +NAZARA_UTILITY_API void NzGenerateCone(float length, float radius, unsigned int subdivision, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); +NAZARA_UTILITY_API void NzGenerateCubicSphere(float size, unsigned int subdivision, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); +NAZARA_UTILITY_API void NzGenerateIcoSphere(float size, unsigned int recursionLevel, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); +NAZARA_UTILITY_API void NzGeneratePlane(const NzVector2ui& subdivision, const NzVector2f& size, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); +NAZARA_UTILITY_API void NzGenerateUvSphere(float size, unsigned int sliceCount, unsigned int stackCount, const NzMatrix4f& matrix, const NzRectf& textureCoords, NzVertexPointers vertexPointers, NzIndexIterator indices, NzBoxf* aabb = nullptr, unsigned int indexOffset = 0); -NAZARA_API void NzOptimizeIndices(NzIndexIterator indices, unsigned int indexCount); +NAZARA_UTILITY_API void NzOptimizeIndices(NzIndexIterator indices, unsigned int indexCount); -NAZARA_API void NzSkinPosition(const NzSkinningData& data, unsigned int startVertex, unsigned int vertexCount); -NAZARA_API void NzSkinPositionNormal(const NzSkinningData& data, unsigned int startVertex, unsigned int vertexCount); -NAZARA_API void NzSkinPositionNormalTangent(const NzSkinningData& data, unsigned int startVertex, unsigned int vertexCount); +NAZARA_UTILITY_API void NzSkinPosition(const NzSkinningData& data, unsigned int startVertex, unsigned int vertexCount); +NAZARA_UTILITY_API void NzSkinPositionNormal(const NzSkinningData& data, unsigned int startVertex, unsigned int vertexCount); +NAZARA_UTILITY_API void NzSkinPositionNormalTangent(const NzSkinningData& data, unsigned int startVertex, unsigned int vertexCount); -NAZARA_API void NzTransformVertices(NzVertexPointers vertexPointers, unsigned int vertexCount, const NzMatrix4f& matrix); +NAZARA_UTILITY_API void NzTransformVertices(NzVertexPointers vertexPointers, unsigned int vertexCount, const NzMatrix4f& matrix); #endif // NAZARA_ALGORITHM_UTILITY_HPP diff --git a/include/Nazara/Utility/Animation.hpp b/include/Nazara/Utility/Animation.hpp index 694f04361..1a74bf407 100644 --- a/include/Nazara/Utility/Animation.hpp +++ b/include/Nazara/Utility/Animation.hpp @@ -16,11 +16,12 @@ #include #include #include +#include #include #include #include -struct NAZARA_API NzAnimationParams +struct NAZARA_UTILITY_API NzAnimationParams { // La frame de fin à charger unsigned int endFrame = std::numeric_limits::max(); @@ -41,7 +42,7 @@ using NzAnimationRef = NzObjectRef; struct NzAnimationImpl; -class NAZARA_API NzAnimation : public NzRefCounted, public NzResource +class NAZARA_UTILITY_API NzAnimation : public NzRefCounted, public NzResource { friend NzAnimationLibrary; friend NzAnimationLoader; diff --git a/include/Nazara/Utility/Buffer.hpp b/include/Nazara/Utility/Buffer.hpp index b34e76e54..16f8a014b 100644 --- a/include/Nazara/Utility/Buffer.hpp +++ b/include/Nazara/Utility/Buffer.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include class NzBuffer; @@ -21,7 +22,7 @@ using NzBufferRef = NzObjectRef; class NzAbstractBuffer; -class NAZARA_API NzBuffer : public NzRefCounted, NzNonCopyable +class NAZARA_UTILITY_API NzBuffer : public NzRefCounted, NzNonCopyable { friend class NzUtility; diff --git a/include/Nazara/Utility/Config.hpp b/include/Nazara/Utility/Config.hpp index 6eae437b9..ee77405be 100644 --- a/include/Nazara/Utility/Config.hpp +++ b/include/Nazara/Utility/Config.hpp @@ -58,4 +58,14 @@ /// Vérification des valeurs et types de certaines constantes #include +#if defined(NAZARA_STATIC) + #define NAZARA_UTILITY_API +#else + #ifdef NAZARA_UTILITY_BUILD + #define NAZARA_UTILITY_API NAZARA_EXPORT + #else + #define NAZARA_UTILITY_API NAZARA_IMPORT + #endif +#endif + #endif // NAZARA_CONFIG_UTILITY_HPP diff --git a/include/Nazara/Utility/Cursor.hpp b/include/Nazara/Utility/Cursor.hpp index 884bd04ab..aebc481ce 100644 --- a/include/Nazara/Utility/Cursor.hpp +++ b/include/Nazara/Utility/Cursor.hpp @@ -9,11 +9,12 @@ #include #include +#include class NzCursorImpl; class NzImage; -class NAZARA_API NzCursor +class NAZARA_UTILITY_API NzCursor { friend class NzWindowImpl; diff --git a/include/Nazara/Utility/Font.hpp b/include/Nazara/Utility/Font.hpp index 944df8eff..babe7d5ce 100644 --- a/include/Nazara/Utility/Font.hpp +++ b/include/Nazara/Utility/Font.hpp @@ -19,7 +19,7 @@ #include #include -struct NAZARA_API NzFontParams +struct NAZARA_UTILITY_API NzFontParams { bool IsValid() const; }; @@ -34,7 +34,7 @@ using NzFontLibrary = NzObjectLibrary; using NzFontLoader = NzResourceLoader; using NzFontRef = NzObjectRef; -class NAZARA_API NzFont : public NzRefCounted, public NzResource, NzNonCopyable +class NAZARA_UTILITY_API NzFont : public NzRefCounted, public NzResource, NzNonCopyable { friend NzFontLibrary; friend NzFontLoader; diff --git a/include/Nazara/Utility/FontData.hpp b/include/Nazara/Utility/FontData.hpp index 11f0e6c9e..7e8408f99 100644 --- a/include/Nazara/Utility/FontData.hpp +++ b/include/Nazara/Utility/FontData.hpp @@ -9,10 +9,11 @@ #include #include +#include struct NzFontGlyph; -class NAZARA_API NzFontData +class NAZARA_UTILITY_API NzFontData { public: NzFontData() = default; diff --git a/include/Nazara/Utility/Formats/MD5AnimParser.hpp b/include/Nazara/Utility/Formats/MD5AnimParser.hpp index f962e489c..bb9500f01 100644 --- a/include/Nazara/Utility/Formats/MD5AnimParser.hpp +++ b/include/Nazara/Utility/Formats/MD5AnimParser.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzMD5AnimParser +class NAZARA_UTILITY_API NzMD5AnimParser { public: struct FrameJoint diff --git a/include/Nazara/Utility/Formats/MD5MeshParser.hpp b/include/Nazara/Utility/Formats/MD5MeshParser.hpp index 345c48296..15915a270 100644 --- a/include/Nazara/Utility/Formats/MD5MeshParser.hpp +++ b/include/Nazara/Utility/Formats/MD5MeshParser.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzMD5MeshParser +class NAZARA_UTILITY_API NzMD5MeshParser { public: struct Joint diff --git a/include/Nazara/Utility/Formats/MTLParser.hpp b/include/Nazara/Utility/Formats/MTLParser.hpp index 2d5220436..6247ca926 100644 --- a/include/Nazara/Utility/Formats/MTLParser.hpp +++ b/include/Nazara/Utility/Formats/MTLParser.hpp @@ -11,9 +11,10 @@ #include #include #include +#include #include -class NAZARA_API NzMTLParser +class NAZARA_UTILITY_API NzMTLParser { public: struct Material diff --git a/include/Nazara/Utility/Formats/OBJParser.hpp b/include/Nazara/Utility/Formats/OBJParser.hpp index 18c0814a6..2a976bd40 100644 --- a/include/Nazara/Utility/Formats/OBJParser.hpp +++ b/include/Nazara/Utility/Formats/OBJParser.hpp @@ -12,9 +12,10 @@ #include #include #include +#include #include -class NzOBJParser +class NAZARA_UTILITY_API NzOBJParser { public: struct FaceVertex diff --git a/include/Nazara/Utility/GuillotineImageAtlas.hpp b/include/Nazara/Utility/GuillotineImageAtlas.hpp index bf65129f6..60973d74d 100644 --- a/include/Nazara/Utility/GuillotineImageAtlas.hpp +++ b/include/Nazara/Utility/GuillotineImageAtlas.hpp @@ -15,7 +15,7 @@ #include #include -class NAZARA_API NzGuillotineImageAtlas : public NzAbstractAtlas +class NAZARA_UTILITY_API NzGuillotineImageAtlas : public NzAbstractAtlas { public: NzGuillotineImageAtlas(); diff --git a/include/Nazara/Utility/Icon.hpp b/include/Nazara/Utility/Icon.hpp index 369cc7639..20dc1db4e 100644 --- a/include/Nazara/Utility/Icon.hpp +++ b/include/Nazara/Utility/Icon.hpp @@ -9,11 +9,12 @@ #include #include +#include class NzImage; class NzIconImpl; -class NAZARA_API NzIcon +class NAZARA_UTILITY_API NzIcon { friend class NzWindowImpl; diff --git a/include/Nazara/Utility/Image.hpp b/include/Nazara/Utility/Image.hpp index 4f7e1e77e..c4b63d1b8 100644 --- a/include/Nazara/Utility/Image.hpp +++ b/include/Nazara/Utility/Image.hpp @@ -23,7 +23,7 @@ ///TODO: Filtres -struct NAZARA_API NzImageParams +struct NAZARA_UTILITY_API NzImageParams { // Le format dans lequel l'image doit être chargée (Undefined pour le format le plus proche de l'original) nzPixelFormat loadFormat = nzPixelFormat_Undefined; @@ -42,7 +42,7 @@ using NzImageLoader = NzResourceLoader; using NzImageManager = NzResourceManager; using NzImageRef = NzObjectRef; -class NAZARA_API NzImage : public NzAbstractImage, public NzRefCounted, public NzResource +class NAZARA_UTILITY_API NzImage : public NzAbstractImage, public NzRefCounted, public NzResource { friend NzImageLibrary; friend NzImageLoader; diff --git a/include/Nazara/Utility/IndexBuffer.hpp b/include/Nazara/Utility/IndexBuffer.hpp index 809b81453..9edc78131 100644 --- a/include/Nazara/Utility/IndexBuffer.hpp +++ b/include/Nazara/Utility/IndexBuffer.hpp @@ -17,7 +17,7 @@ class NzIndexBuffer; using NzIndexBufferConstRef = NzObjectRef; using NzIndexBufferRef = NzObjectRef; -class NAZARA_API NzIndexBuffer : public NzRefCounted +class NAZARA_UTILITY_API NzIndexBuffer : public NzRefCounted { public: NzIndexBuffer() = default; diff --git a/include/Nazara/Utility/IndexMapper.hpp b/include/Nazara/Utility/IndexMapper.hpp index 6df36f8db..b8ca13535 100644 --- a/include/Nazara/Utility/IndexMapper.hpp +++ b/include/Nazara/Utility/IndexMapper.hpp @@ -18,7 +18,7 @@ class NzSubMesh; using NzIndexMapperGetter = nzUInt32 (*)(const void* buffer, unsigned int i); using NzIndexMapperSetter = void (*)(void* buffer, unsigned int i, nzUInt32 value); -class NAZARA_API NzIndexMapper +class NAZARA_UTILITY_API NzIndexMapper { public: NzIndexMapper(NzIndexBuffer* indexBuffer, nzBufferAccess access = nzBufferAccess_ReadWrite); diff --git a/include/Nazara/Utility/Joint.hpp b/include/Nazara/Utility/Joint.hpp index 1aec0d5dd..59747f3aa 100644 --- a/include/Nazara/Utility/Joint.hpp +++ b/include/Nazara/Utility/Joint.hpp @@ -14,7 +14,7 @@ class NzSkeleton; -class NAZARA_API NzJoint : public NzNode +class NAZARA_UTILITY_API NzJoint : public NzNode { public: NzJoint(NzSkeleton* skeleton); diff --git a/include/Nazara/Utility/Joystick.hpp b/include/Nazara/Utility/Joystick.hpp index 8260a9302..457cf0aa1 100644 --- a/include/Nazara/Utility/Joystick.hpp +++ b/include/Nazara/Utility/Joystick.hpp @@ -10,7 +10,7 @@ #include #include -class NAZARA_API NzJoystick +class NAZARA_UTILITY_API NzJoystick { public: NzJoystick() = delete; diff --git a/include/Nazara/Utility/Keyboard.hpp b/include/Nazara/Utility/Keyboard.hpp index 475ec7e91..a6024756d 100644 --- a/include/Nazara/Utility/Keyboard.hpp +++ b/include/Nazara/Utility/Keyboard.hpp @@ -11,8 +11,9 @@ #include #include +#include -class NAZARA_API NzKeyboard +class NAZARA_UTILITY_API NzKeyboard { public: enum Key diff --git a/include/Nazara/Utility/Mesh.hpp b/include/Nazara/Utility/Mesh.hpp index e4e64a323..ccb1d67e8 100644 --- a/include/Nazara/Utility/Mesh.hpp +++ b/include/Nazara/Utility/Mesh.hpp @@ -22,7 +22,7 @@ #include #include -struct NAZARA_API NzMeshParams +struct NAZARA_UTILITY_API NzMeshParams { NzMeshParams(); // Vérifie que le storage par défaut est supporté (software autrement) @@ -61,7 +61,7 @@ using NzMeshRef = NzObjectRef; struct NzMeshImpl; -class NAZARA_API NzMesh : public NzRefCounted, public NzResource +class NAZARA_UTILITY_API NzMesh : public NzRefCounted, public NzResource { friend NzMeshLibrary; friend NzMeshLoader; diff --git a/include/Nazara/Utility/Mouse.hpp b/include/Nazara/Utility/Mouse.hpp index 8dad35bbd..7bfa580b6 100644 --- a/include/Nazara/Utility/Mouse.hpp +++ b/include/Nazara/Utility/Mouse.hpp @@ -11,10 +11,11 @@ #include #include +#include class NzWindow; -class NAZARA_API NzMouse +class NAZARA_UTILITY_API NzMouse { public: enum Button diff --git a/include/Nazara/Utility/Node.hpp b/include/Nazara/Utility/Node.hpp index 25d83f997..4a13fd918 100644 --- a/include/Nazara/Utility/Node.hpp +++ b/include/Nazara/Utility/Node.hpp @@ -12,11 +12,12 @@ #include #include #include +#include #include #include #include -class NAZARA_API NzNode +class NAZARA_UTILITY_API NzNode { public: NzNode(); diff --git a/include/Nazara/Utility/PixelFormat.hpp b/include/Nazara/Utility/PixelFormat.hpp index 3e1aa254f..c7068868a 100644 --- a/include/Nazara/Utility/PixelFormat.hpp +++ b/include/Nazara/Utility/PixelFormat.hpp @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -49,8 +50,8 @@ class NzPixelFormat static bool Initialize(); static void Uninitialize(); - static NAZARA_API ConvertFunction s_convertFunctions[nzPixelFormat_Max+1][nzPixelFormat_Max+1]; - static NAZARA_API std::map s_flipFunctions[nzPixelFlipping_Max+1]; + static NAZARA_UTILITY_API ConvertFunction s_convertFunctions[nzPixelFormat_Max+1][nzPixelFormat_Max+1]; + static NAZARA_UTILITY_API std::map s_flipFunctions[nzPixelFlipping_Max+1]; }; #include diff --git a/include/Nazara/Utility/SimpleTextDrawer.hpp b/include/Nazara/Utility/SimpleTextDrawer.hpp index 92dfb240e..ae2da4bf7 100644 --- a/include/Nazara/Utility/SimpleTextDrawer.hpp +++ b/include/Nazara/Utility/SimpleTextDrawer.hpp @@ -14,7 +14,7 @@ #include #include -class NAZARA_API NzSimpleTextDrawer : public NzAbstractTextDrawer +class NAZARA_UTILITY_API NzSimpleTextDrawer : public NzAbstractTextDrawer { public: NzSimpleTextDrawer(); diff --git a/include/Nazara/Utility/SkeletalMesh.hpp b/include/Nazara/Utility/SkeletalMesh.hpp index 7a916ac4a..ba7a617a9 100644 --- a/include/Nazara/Utility/SkeletalMesh.hpp +++ b/include/Nazara/Utility/SkeletalMesh.hpp @@ -17,7 +17,7 @@ class NzSkeletalMesh; using NzSkeletalMeshConstRef = NzObjectRef; using NzSkeletalMeshRef = NzObjectRef; -class NAZARA_API NzSkeletalMesh final : public NzSubMesh +class NAZARA_UTILITY_API NzSkeletalMesh final : public NzSubMesh { public: NzSkeletalMesh(const NzMesh* parent); diff --git a/include/Nazara/Utility/Skeleton.hpp b/include/Nazara/Utility/Skeleton.hpp index 001145213..fc386eb76 100644 --- a/include/Nazara/Utility/Skeleton.hpp +++ b/include/Nazara/Utility/Skeleton.hpp @@ -24,7 +24,7 @@ using NzSkeletonRef = NzObjectRef; struct NzSkeletonImpl; -class NAZARA_API NzSkeleton : public NzRefCounted +class NAZARA_UTILITY_API NzSkeleton : public NzRefCounted { friend NzJoint; friend NzSkeletonLibrary; diff --git a/include/Nazara/Utility/StaticMesh.hpp b/include/Nazara/Utility/StaticMesh.hpp index a3c9fb6bf..9d4f8d548 100644 --- a/include/Nazara/Utility/StaticMesh.hpp +++ b/include/Nazara/Utility/StaticMesh.hpp @@ -16,7 +16,7 @@ class NzStaticMesh; using NzStaticMeshConstRef = NzObjectRef; using NzStaticMeshRef = NzObjectRef; -class NAZARA_API NzStaticMesh final : public NzSubMesh +class NAZARA_UTILITY_API NzStaticMesh final : public NzSubMesh { public: NzStaticMesh(const NzMesh* parent); diff --git a/include/Nazara/Utility/SubMesh.hpp b/include/Nazara/Utility/SubMesh.hpp index 74f67467e..f46727d5f 100644 --- a/include/Nazara/Utility/SubMesh.hpp +++ b/include/Nazara/Utility/SubMesh.hpp @@ -22,7 +22,7 @@ class NzSubMesh; using NzSubMeshConstRef = NzObjectRef; using NzSubMeshRef = NzObjectRef; -class NAZARA_API NzSubMesh : public NzRefCounted +class NAZARA_UTILITY_API NzSubMesh : public NzRefCounted { friend NzMesh; diff --git a/include/Nazara/Utility/TriangleIterator.hpp b/include/Nazara/Utility/TriangleIterator.hpp index 59288fa1d..52b0f935f 100644 --- a/include/Nazara/Utility/TriangleIterator.hpp +++ b/include/Nazara/Utility/TriangleIterator.hpp @@ -13,7 +13,7 @@ class NzSubMesh; -class NAZARA_API NzTriangleIterator +class NAZARA_UTILITY_API NzTriangleIterator { public: NzTriangleIterator(nzPrimitiveMode primitiveMode, const NzIndexBuffer* indexBuffer); diff --git a/include/Nazara/Utility/Utility.hpp b/include/Nazara/Utility/Utility.hpp index fa40d5135..be840afb7 100644 --- a/include/Nazara/Utility/Utility.hpp +++ b/include/Nazara/Utility/Utility.hpp @@ -9,9 +9,10 @@ #include #include +#include #include -class NAZARA_API NzUtility +class NAZARA_UTILITY_API NzUtility { public: NzUtility() = delete; diff --git a/include/Nazara/Utility/VertexBuffer.hpp b/include/Nazara/Utility/VertexBuffer.hpp index e10f701b0..8bc4b4ad0 100644 --- a/include/Nazara/Utility/VertexBuffer.hpp +++ b/include/Nazara/Utility/VertexBuffer.hpp @@ -19,7 +19,7 @@ class NzVertexBuffer; using NzVertexBufferConstRef = NzObjectRef; using NzVertexBufferRef = NzObjectRef; -class NAZARA_API NzVertexBuffer : public NzRefCounted +class NAZARA_UTILITY_API NzVertexBuffer : public NzRefCounted { public: NzVertexBuffer() = default; diff --git a/include/Nazara/Utility/VertexDeclaration.hpp b/include/Nazara/Utility/VertexDeclaration.hpp index 68d73ad4a..e58da9947 100644 --- a/include/Nazara/Utility/VertexDeclaration.hpp +++ b/include/Nazara/Utility/VertexDeclaration.hpp @@ -12,6 +12,7 @@ #include #include #include +#include #include class NzVertexDeclaration; @@ -20,7 +21,7 @@ using NzVertexDeclarationConstRef = NzObjectRef; using NzVertexDeclarationLibrary = NzObjectLibrary; using NzVertexDeclarationRef = NzObjectRef; -class NAZARA_API NzVertexDeclaration : public NzRefCounted +class NAZARA_UTILITY_API NzVertexDeclaration : public NzRefCounted { friend NzVertexDeclarationLibrary; friend class NzUtility; diff --git a/include/Nazara/Utility/VertexMapper.hpp b/include/Nazara/Utility/VertexMapper.hpp index 3830ff103..4af27d053 100644 --- a/include/Nazara/Utility/VertexMapper.hpp +++ b/include/Nazara/Utility/VertexMapper.hpp @@ -15,7 +15,7 @@ class NzSubMesh; -class NAZARA_API NzVertexMapper +class NAZARA_UTILITY_API NzVertexMapper { public: NzVertexMapper(NzSubMesh* subMesh, nzBufferAccess access = nzBufferAccess_ReadWrite); diff --git a/include/Nazara/Utility/VideoMode.hpp b/include/Nazara/Utility/VideoMode.hpp index 57b0c7d63..25f9292cc 100644 --- a/include/Nazara/Utility/VideoMode.hpp +++ b/include/Nazara/Utility/VideoMode.hpp @@ -10,9 +10,10 @@ #define NAZARA_VIDEOMODE_HPP #include +#include #include -class NAZARA_API NzVideoMode +class NAZARA_UTILITY_API NzVideoMode { public: NzVideoMode(); diff --git a/include/Nazara/Utility/Window.hpp b/include/Nazara/Utility/Window.hpp index 1850c07a4..aee4f693a 100644 --- a/include/Nazara/Utility/Window.hpp +++ b/include/Nazara/Utility/Window.hpp @@ -30,7 +30,7 @@ class NzImage; class NzIcon; class NzWindowImpl; -class NAZARA_API NzWindow : NzNonCopyable +class NAZARA_UTILITY_API NzWindow : NzNonCopyable { friend NzWindowImpl; friend class NzMouse; diff --git a/src/Nazara/Physics/Geom.cpp b/src/Nazara/Physics/Geom.cpp index 3d799d117..5fcf4e8bf 100644 --- a/src/Nazara/Physics/Geom.cpp +++ b/src/Nazara/Physics/Geom.cpp @@ -408,7 +408,7 @@ NzBoxf NzSphereGeom::ComputeAABB(const NzMatrix4f& offsetMatrix, const NzVector3 float NzSphereGeom::ComputeVolume() const { - return M_PI * m_radius * m_radius * m_radius / 3.f; + return float(M_PI) * m_radius * m_radius * m_radius / 3.f; } float NzSphereGeom::GetRadius() const diff --git a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp index 60fb98f07..5521d60b1 100644 --- a/src/Nazara/Utility/Formats/FreeTypeLoader.cpp +++ b/src/Nazara/Utility/Formats/FreeTypeLoader.cpp @@ -303,7 +303,7 @@ namespace m_stream.descriptor.pointer = &stream; m_stream.read = FT_StreamRead; m_stream.pos = 0; - m_stream.size = unsigned long(stream.GetSize()); + m_stream.size = static_cast(stream.GetSize()); m_args.driver = 0; m_args.flags = FT_OPEN_STREAM;