flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed preprocessor definitions in Linux

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@831 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-09-04 15:29:45 +00:00
parent 58b1b3160d
commit b379f35f4f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GNUmakefile
View File

@ -39,8 +39,8 @@ ifeq ($(release),1)
################ ################
# release build - fastest run-time, no gdb support # release build - fastest run-time, no gdb support
################ ################
CC_OPTIONS = -s -O3 CC_OPTIONS = -s -O3 -DNDEBUG
CXX_OPTIONS = -s -O3 CXX_OPTIONS = -s -O3 -DNDEBUG
LNK_OPTIONS = -lstdc++ -pthread -O3 LNK_OPTIONS = -lstdc++ -pthread -O3
BUILDDIR = build/release/ BUILDDIR = build/release/
@ -49,8 +49,8 @@ ifeq ($(profile),1)
################ ################
# profile build - a release build with symbols and profiling engine built in # profile build - a release build with symbols and profiling engine built in
################ ################
CC_OPTIONS = -s -ggdb -O3 -pg CC_OPTIONS = -s -ggdb -O3 -pg -DNDEBUG
CXX_OPTIONS = -s -ggdb -O3 -pg CXX_OPTIONS = -s -ggdb -O3 -pg -DNDEBUG
LNK_OPTIONS = -lstdc++ -pthread -ggdb -O3 -pg LNK_OPTIONS = -lstdc++ -pthread -ggdb -O3 -pg
BUILDDIR = build/profile/ BUILDDIR = build/profile/

6
source/Globals.h
View File

@ -187,10 +187,10 @@ typedef short Int16;
#define FAST_FLOOR_DIV( x, div ) ( (x) < 0 ? (((int)x / div) - 1) : ((int)x / div) ) #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 // Own version of assert() that writes failed assertions to the log for review
#ifdef NDEBUG #ifdef _DEBUG
#define ASSERT(x) ((void)0)
#else
#define ASSERT( x ) ( !!(x) || ( LOGERROR("Assertion failed: %s, file %s, line %i", #x, __FILE__, __LINE__ ), assert(0), 0 ) ) #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 #endif
// Pretty much the same as ASSERT() but stays in Release builds // Pretty much the same as ASSERT() but stays in Release builds