From a59593b1d213648ef2ee48cbc08e900c2d995838 Mon Sep 17 00:00:00 2001 From: Branimir Karadzic Date: Sat, 23 Aug 2014 14:01:52 -0700 Subject: [PATCH] Fixed missing define. --- src/bgfx.cpp | 2 +- src/bgfx_p.h | 14 +++++++------- src/config.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bgfx.cpp b/src/bgfx.cpp index c471f02c3..f93e128ff 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -130,7 +130,7 @@ namespace bgfx }; #ifndef BGFX_CONFIG_MEMORY_TRACKING -# define BGFX_CONFIG_MEMORY_TRACKING (BGFX_CONFIG_DEBUG && BX_CONFIG_SUPPORTED_THREADING) +# define BGFX_CONFIG_MEMORY_TRACKING (BGFX_CONFIG_DEBUG && BX_CONFIG_SUPPORTS_THREADING) #endif // BGFX_CONFIG_MEMORY_TRACKING class AllocatorStub : public bx::ReallocatorI diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 2fd00fe53..2f3013b91 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -6,6 +6,13 @@ #ifndef BGFX_P_H_HEADER_GUARD #define BGFX_P_H_HEADER_GUARD +#if BGFX_CONFIG_DEBUG +# define BX_TRACE _BX_TRACE +# define BX_WARN _BX_WARN +# define BX_CHECK _BX_CHECK +# define BX_CONFIG_ALLOCATOR_DEBUG 1 +#endif // BGFX_CONFIG_DEBUG + #include "bgfx.h" #include "config.h" @@ -44,13 +51,6 @@ namespace bgfx } \ BX_MACRO_BLOCK_END -#if BGFX_CONFIG_DEBUG -# define BX_TRACE _BX_TRACE -# define BX_WARN _BX_WARN -# define BX_CHECK _BX_CHECK -# define BX_CONFIG_ALLOCATOR_DEBUG 1 -#endif // BGFX_CONFIG_DEBUG - #define BGFX_FATAL(_condition, _err, _format, ...) \ BX_MACRO_BLOCK_BEGIN \ if (!BX_IGNORE_C4127(_condition) ) \ diff --git a/src/config.h b/src/config.h index ffed9914b..4510f7b80 100644 --- a/src/config.h +++ b/src/config.h @@ -6,7 +6,7 @@ #ifndef BGFX_CONFIG_H_HEADER_GUARD #define BGFX_CONFIG_H_HEADER_GUARD -#include +#include #ifndef BGFX_CONFIG_DEBUG # define BGFX_CONFIG_DEBUG 0