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

@@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Noise/MappedNoiseBase.hpp>
class NAZARA_API NzAbstract2DNoise : public NzMappedNoiseBase
class NAZARA_NOISE_API NzAbstract2DNoise : public NzMappedNoiseBase
{
public:
virtual ~NzAbstract2DNoise();

View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Noise/MappedNoiseBase.hpp>
class NAZARA_API NzAbstract3DNoise : public NzMappedNoiseBase
class NAZARA_NOISE_API NzAbstract3DNoise : public NzMappedNoiseBase
{
public:
virtual ~NzAbstract3DNoise();

View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Noise/MappedNoiseBase.hpp>
class NAZARA_API NzAbstract4DNoise : public NzMappedNoiseBase
class NAZARA_NOISE_API NzAbstract4DNoise : public NzMappedNoiseBase
{
public:
virtual ~NzAbstract4DNoise();

View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp>
#include <array>
class NAZARA_API NzComplexNoiseBase
class NAZARA_NOISE_API NzComplexNoiseBase
{
public:
NzComplexNoiseBase();

View File

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

View File

@@ -11,7 +11,7 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Abstract2DNoise.hpp>
class NAZARA_API NzFBM2D : public NzAbstract2DNoise, public NzComplexNoiseBase
class NAZARA_NOISE_API NzFBM2D : public NzAbstract2DNoise, public NzComplexNoiseBase
{
public:
NzFBM2D(nzNoises source, unsigned int seed);

View File

@@ -11,7 +11,7 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Abstract3DNoise.hpp>
class NAZARA_API NzFBM3D : public NzAbstract3DNoise, public NzComplexNoiseBase
class NAZARA_NOISE_API NzFBM3D : public NzAbstract3DNoise, public NzComplexNoiseBase
{
public:
NzFBM3D(nzNoises source, unsigned int seed);

View File

@@ -11,7 +11,7 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Abstract4DNoise.hpp>
class NAZARA_API NzFBM4D : public NzAbstract4DNoise, public NzComplexNoiseBase
class NAZARA_NOISE_API NzFBM4D : public NzAbstract4DNoise, public NzComplexNoiseBase
{
public:
NzFBM4D(nzNoises source, unsigned int seed);

View File

@@ -11,7 +11,7 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Abstract3DNoise.hpp>
class NAZARA_API NzHybridMultiFractal3D : public NzAbstract3DNoise, public NzComplexNoiseBase
class NAZARA_NOISE_API NzHybridMultiFractal3D : public NzAbstract3DNoise, public NzComplexNoiseBase
{
public:
NzHybridMultiFractal3D(nzNoises source, unsigned int seed);

View File

@@ -11,7 +11,7 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Abstract4DNoise.hpp>
class NAZARA_API NzHybridMultiFractal4D : public NzAbstract4DNoise, public NzComplexNoiseBase
class NAZARA_NOISE_API NzHybridMultiFractal4D : public NzAbstract4DNoise, public NzComplexNoiseBase
{
public:
NzHybridMultiFractal4D(nzNoises source, unsigned int seed);

View File

@@ -11,7 +11,7 @@
#include <Nazara/Noise/ComplexNoiseBase.hpp>
#include <Nazara/Noise/Abstract2DNoise.hpp>
class NAZARA_API NzHybridMultiFractal2D : public NzAbstract2DNoise, public NzComplexNoiseBase
class NAZARA_NOISE_API NzHybridMultiFractal2D : public NzAbstract2DNoise, public NzComplexNoiseBase
{
public:
NzHybridMultiFractal2D(nzNoises source, unsigned int seed);

View File

@@ -10,7 +10,7 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Noise/NoiseBase.hpp>
class NAZARA_API NzMappedNoiseBase : public NzNoiseBase
class NAZARA_NOISE_API NzMappedNoiseBase : public NzNoiseBase
{
public:
NzMappedNoiseBase();

View File

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

View File

@@ -8,6 +8,7 @@
#define NOISEBASE_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Noise/Config.hpp>
enum nzNoises
{
@@ -16,7 +17,7 @@ enum nzNoises
CELL
};
class NAZARA_API NzNoiseBase
class NAZARA_NOISE_API NzNoiseBase
{
public:
NzNoiseBase(unsigned int seed = 0);

View File

@@ -12,7 +12,7 @@
#include <Nazara/Noise/Abstract2DNoise.hpp>
#include <Nazara/Math/Vector2.hpp>
class NAZARA_API NzPerlin2D : public NzAbstract2DNoise
class NAZARA_NOISE_API NzPerlin2D : public NzAbstract2DNoise
{
public:
NzPerlin2D();

View File

@@ -12,7 +12,7 @@
#include <Nazara/Noise/Abstract3DNoise.hpp>
#include <Nazara/Math/Vector3.hpp>
class NAZARA_API NzPerlin3D : public NzAbstract3DNoise
class NAZARA_NOISE_API NzPerlin3D : public NzAbstract3DNoise
{
public:
NzPerlin3D();

View File

@@ -12,7 +12,7 @@
#include <Nazara/Noise/Abstract4DNoise.hpp>
#include <Nazara/Math/Vector4.hpp>
class NAZARA_API NzPerlin4D : public NzAbstract4DNoise
class NAZARA_NOISE_API NzPerlin4D : public NzAbstract4DNoise
{
public:
NzPerlin4D();

View File

@@ -12,7 +12,7 @@
#include <Nazara/Noise/Abstract2DNoise.hpp>
#include <Nazara/Math/Vector2.hpp>
class NAZARA_API NzSimplex2D : public NzAbstract2DNoise
class NAZARA_NOISE_API NzSimplex2D : public NzAbstract2DNoise
{
public:
NzSimplex2D();

View File

@@ -12,7 +12,7 @@
#include <Nazara/Noise/Abstract3DNoise.hpp>
#include <Nazara/Math/Vector3.hpp>
class NAZARA_API NzSimplex3D : public NzAbstract3DNoise
class NAZARA_NOISE_API NzSimplex3D : public NzAbstract3DNoise
{
public:
NzSimplex3D();

View File

@@ -12,7 +12,7 @@
#include <Nazara/Noise/Abstract4DNoise.hpp>
#include <Nazara/Math/Vector4.hpp>
class NAZARA_API NzSimplex4D : public NzAbstract4DNoise
class NAZARA_NOISE_API NzSimplex4D : public NzAbstract4DNoise
{
public:
NzSimplex4D();