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

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

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

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

@@ -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

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

@@ -15,7 +15,7 @@
#include <Nazara/Core/ThreadSafetyOff.hpp>
#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

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

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

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

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

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

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

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

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

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

@@ -13,10 +13,10 @@
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/MemoryManager.hpp>
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

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

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

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

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

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

@@ -23,7 +23,7 @@
#define NazaraInternalError(err) NzError::Error(nzErrorType_Internal, err, __LINE__, NzDirectory::GetCurrentFileRelativeToEngine(__FILE__), NAZARA_FUNCTION)
#define 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;

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

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

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

@@ -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

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

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

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

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

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

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

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

@@ -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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@
#include <Nazara/Core/String.hpp>
#include <iosfwd>
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;

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@
#include <cstdio>
#include <cstring>
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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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 <Nazara/Core/String.inl>

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

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

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

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

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

@@ -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);

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

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