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

Separate NAZARA_API into multiple defines (one per module)

Browse Source 
To fix inter-module dependency


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

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

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

19
include/Nazara/Physics/Geom.hpp
View File

@@ -17,6 +17,7 @@
#include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics/Config.hpp>
#include <Nazara/Physics/Enums.hpp>
#include <unordered_map>
@@ -34,7 +35,7 @@ using NzPhysGeomConstRef = NzObjectRef<const NzPhysGeom>;
using NzPhysGeomLibrary = NzObjectLibrary<NzPhysGeom>;
using NzPhysGeomRef = NzObjectRef<NzPhysGeom>;
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<const NzBoxGeom>;
using NzBoxGeomRef = NzObjectRef<NzBoxGeom>;
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<const NzCapsuleGeom>;
using NzCapsuleGeomRef = NzObjectRef<NzCapsuleGeom>;
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<const NzCompoundGeom>;
using NzCompoundGeomRef = NzObjectRef<NzCompoundGeom>;
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<const NzConeGeom>;
using NzConeGeomRef = NzObjectRef<NzConeGeom>;
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<const NzConvexHullGeom>;
using NzConvexHullGeomRef = NzObjectRef<NzConvexHullGeom>;
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<const NzCylinderGeom>;
using NzCylinderGeomRef = NzObjectRef<NzCylinderGeom>;
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<const NzNullGeom>;
using NzNullGeomRef = NzObjectRef<NzNullGeom>;
class NAZARA_API NzNullGeom : public NzPhysGeom
class NAZARA_PHYSICS_API NzNullGeom : public NzPhysGeom
{
public:
NzNullGeom();
@@ -229,7 +230,7 @@ class NzSphereGeom;
using NzSphereGeomConstRef = NzObjectRef<const NzSphereGeom>;
using NzSphereGeomRef = NzObjectRef<NzSphereGeom>;
class NAZARA_API NzSphereGeom : public NzPhysGeom
class NAZARA_PHYSICS_API NzSphereGeom : public NzPhysGeom
{
public:
NzSphereGeom(float radius, const NzMatrix4f& transformMatrix = NzMatrix4f::Identity());

3
include/Nazara/Physics/PhysObject.hpp
View File

@@ -13,12 +13,13 @@
#include <Nazara/Math/Matrix4.hpp>
#include <Nazara/Math/Quaternion.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics/Config.hpp>
#include <Nazara/Physics/Geom.hpp>
class NzPhysWorld;
struct NewtonBody;
class NAZARA_API NzPhysObject
class NAZARA_PHYSICS_API NzPhysObject
{
public:
NzPhysObject(NzPhysWorld* world, const NzMatrix4f& mat = NzMatrix4f::Identity());

3
include/Nazara/Physics/PhysWorld.hpp
View File

@@ -11,10 +11,11 @@
#include <Nazara/Core/NonCopyable.hpp>
#include <Nazara/Math/Box.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics/Config.hpp>
struct NewtonWorld;
class NAZARA_API NzPhysWorld : NzNonCopyable
class NAZARA_PHYSICS_API NzPhysWorld : NzNonCopyable
{
public:
NzPhysWorld();

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

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