From b379f35f4f09ef8241d109419238cbac6e036bbd Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 4 Sep 2012 15:29:45 +0000 Subject: Fixed preprocessor definitions in Linux git-svn-id: http://mc-server.googlecode.com/svn/trunk@831 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- GNUmakefile | 8 ++++---- source/Globals.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 081513c24..3c0da26db 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -39,8 +39,8 @@ ifeq ($(release),1) ################ # release build - fastest run-time, no gdb support ################ -CC_OPTIONS = -s -O3 -CXX_OPTIONS = -s -O3 +CC_OPTIONS = -s -O3 -DNDEBUG +CXX_OPTIONS = -s -O3 -DNDEBUG LNK_OPTIONS = -lstdc++ -pthread -O3 BUILDDIR = build/release/ @@ -49,8 +49,8 @@ ifeq ($(profile),1) ################ # profile build - a release build with symbols and profiling engine built in ################ -CC_OPTIONS = -s -ggdb -O3 -pg -CXX_OPTIONS = -s -ggdb -O3 -pg +CC_OPTIONS = -s -ggdb -O3 -pg -DNDEBUG +CXX_OPTIONS = -s -ggdb -O3 -pg -DNDEBUG LNK_OPTIONS = -lstdc++ -pthread -ggdb -O3 -pg BUILDDIR = build/profile/ diff --git a/source/Globals.h b/source/Globals.h index 9ea0825c1..1a4a361ee 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -187,10 +187,10 @@ typedef short Int16; #define FAST_FLOOR_DIV( x, div ) ( (x) < 0 ? (((int)x / div) - 1) : ((int)x / div) ) // Own version of assert() that writes failed assertions to the log for review -#ifdef NDEBUG - #define ASSERT(x) ((void)0) -#else +#ifdef _DEBUG #define ASSERT( x ) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), assert(0), 0 ) ) +#else + #define ASSERT(x) ((void)0) #endif // Pretty much the same as ASSERT() but stays in Release builds -- cgit v1.2.3