Separate NAZARA_API into multiple defines (one per module)

To fix inter-module dependency


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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -16,7 +16,7 @@
#include <Nazara/Utility/VertexBuffer.hpp>
#include <vector>
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<NzSkeletalModel, NzSkeletalModelParameters>;
class NAZARA_API NzSkeletalModel : public NzModel, NzUpdatable
class NAZARA_GRAPHICS_API NzSkeletalModel : public NzModel, NzUpdatable
{
friend NzSkeletalModelLoader;

View File

@@ -8,12 +8,13 @@
#define NAZARA_SKINNINGMANAGER_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Graphics/Config.hpp>
class NzSkeleton;
class NzSkeletalMesh;
class NzVertexBuffer;
class NAZARA_API NzSkinningManager
class NAZARA_GRAPHICS_API NzSkinningManager
{
friend class NzGraphics;

View File

@@ -15,7 +15,7 @@
#include <Nazara/Utility/IndexBuffer.hpp>
#include <Nazara/Utility/VertexBuffer.hpp>
class NAZARA_API NzSkyboxBackground : public NzAbstractBackground
class NAZARA_GRAPHICS_API NzSkyboxBackground : public NzAbstractBackground
{
public:
NzSkyboxBackground();

View File

@@ -13,7 +13,7 @@
#include <Nazara/Utility/VertexStruct.hpp>
#include <array>
class NAZARA_API NzSprite : public NzSceneNode
class NAZARA_GRAPHICS_API NzSprite : public NzSceneNode
{
public:
NzSprite();

View File

@@ -22,7 +22,7 @@ using NzTextSpriteConstRef = NzObjectRef<const NzTextSprite>;
using NzTextSpriteLibrary = NzObjectLibrary<NzTextSprite>;
using NzTextSpriteRef = NzObjectRef<NzTextSprite>;
class NAZARA_API NzTextSprite : public NzRenderable
class NAZARA_GRAPHICS_API NzTextSprite : public NzRenderable
{
public:
NzTextSprite();

View File

@@ -12,7 +12,7 @@
#include <Nazara/Renderer/UberShader.hpp>
#include <Nazara/Renderer/Texture.hpp>
class NAZARA_API NzTextureBackground : public NzAbstractBackground
class NAZARA_GRAPHICS_API NzTextureBackground : public NzAbstractBackground
{
public:
NzTextureBackground();

View File

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