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

Core/Prerequesites: Remove NDEBUG automatic definition (not used)

This commit is contained in:
Lynix 2016-11-18 21:18:45 +01:00
parent a1b71467c6
commit 37a04ed4b3
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/Nazara/Prerequesites.hpp
View File

@ -25,8 +25,7 @@
#ifndef NAZARA_PREREQUESITES_HPP #ifndef NAZARA_PREREQUESITES_HPP
#define NAZARA_PREREQUESITES_HPP #define NAZARA_PREREQUESITES_HPP
// Identification du compilateur // Try to identify the compiler
///TODO: Rajouter des tests d'identification de compilateurs
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#define NAZARA_COMPILER_BORDLAND #define NAZARA_COMPILER_BORDLAND
#define NAZARA_COMPILER_SUPPORTS_CPP11 (defined(__cplusplus) && __cplusplus >= 201103L) #define NAZARA_COMPILER_SUPPORTS_CPP11 (defined(__cplusplus) && __cplusplus >= 201103L)
@ -63,10 +62,10 @@
#pragma warning(disable: 4251) #pragma warning(disable: 4251)
#else #else
#define NAZARA_COMPILER_UNKNOWN #define NAZARA_COMPILER_UNKNOWN
#define NAZARA_COMPILER_SUPPORTS_CPP11 (defined(__cplusplus) && __cplusplus >= 201103L)
#define NAZARA_DEPRECATED(txt) #define NAZARA_DEPRECATED(txt)
#define NAZARA_FUNCTION __func__ // __func__ est standard depuis le C++11 #define NAZARA_FUNCTION __func__ // __func__ has been standardized in C++ 2011
/// Cette ligne n'est là que pour prévenir, n'hésitez pas à la commenter si elle vous empêche de compiler
#pragma message This compiler is not fully supported #pragma message This compiler is not fully supported
#endif #endif
@ -81,15 +80,15 @@
#include <Nazara/Core/Config.hpp> #include <Nazara/Core/Config.hpp>
// Identification de la plateforme // Try to identify target platform via defines
#if defined(_WIN32) #if defined(_WIN32)
#define NAZARA_PLATFORM_WINDOWS #define NAZARA_PLATFORM_WINDOWS
#define NAZARA_EXPORT __declspec(dllexport) #define NAZARA_EXPORT __declspec(dllexport)
#define NAZARA_IMPORT __declspec(dllimport) #define NAZARA_IMPORT __declspec(dllimport)
// Des defines pour le header Windows // Somes defines for windows.h include..
#if defined(NAZARA_BUILD) // Pour ne pas entrer en conflit avec les defines de l'application ou d'une autre bibliothèque #if defined(NAZARA_BUILD)
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#endif #endif
@ -99,13 +98,12 @@
#endif #endif
#if NAZARA_CORE_WINDOWS_NT6 #if NAZARA_CORE_WINDOWS_NT6
// Version de Windows minimale : Vista
#define NAZARA_WINNT 0x0600 #define NAZARA_WINNT 0x0600
#else #else
#define NAZARA_WINNT 0x0501 #define NAZARA_WINNT 0x0501
#endif #endif
// Pour ne pas casser le define déjà en place s'il est applicable // Keep the actual define if existing and greater than our requirement
#if defined(_WIN32_WINNT) #if defined(_WIN32_WINNT)
#if _WIN32_WINNT < NAZARA_WINNT #if _WIN32_WINNT < NAZARA_WINNT
#undef _WIN32_WINNT #undef _WIN32_WINNT
@ -128,7 +126,6 @@
#define NAZARA_PLATFORM_MACOSX #define NAZARA_PLATFORM_MACOSX
#define NAZARA_PLATFORM_POSIX*/ #define NAZARA_PLATFORM_POSIX*/
#else #else
// À commenter pour tenter quand même une compilation
#error This operating system is not fully supported by the Nazara Engine #error This operating system is not fully supported by the Nazara Engine
#define NAZARA_PLATFORM_UNKNOWN #define NAZARA_PLATFORM_UNKNOWN
@ -141,12 +138,7 @@
#define NAZARA_PLATFORM_x64 #define NAZARA_PLATFORM_x64
#endif #endif
// Définit NDEBUG si NAZARA_DEBUG n'est pas présent // A bunch of useful macros
#if !defined(NAZARA_DEBUG) && !defined(NDEBUG)
#define NDEBUG
#endif
// Macros supplémentaires
#define NazaraPrefix(a, prefix) prefix ## a #define NazaraPrefix(a, prefix) prefix ## a
#define NazaraPrefixMacro(a, prefix) NazaraPrefix(a, prefix) #define NazaraPrefixMacro(a, prefix) NazaraPrefix(a, prefix)
#define NazaraSuffix(a, suffix) a ## suffix #define NazaraSuffix(a, suffix) a ## suffix