Removed unused defs GRAY_SVR, _CONSOLE, _REENTRANT from Linux makefile
SHELL = /bin/bash
# Generic makefile
-#ifdef FORCE32
MARCH = -march=i686 -m32
-#endif
OPTDEFAULT = -fno-omit-frame-pointer -ffast-math -fpermissive $(MARCH)
COPTDEFAULT = -fno-omit-frame-pointer -ffast-math $(MARCH)
@@ -12,34 +10,24 @@ COPT = -O0 -fno-expensive-optimizations $(COPTDEFAULT)
WARN = -Wall -Wno-unknown-pragmas -Wno-invalid-offsetof -Wno-unused-but-set-variable -Wno-switch
CWARN = -Wall -Wno-unknown-pragmas -Wno-unused-but-set-variable -Wno-switch -Wno-implicit-function-declaration
-ifdef DBG
-DEBUG = -s -ggdb3
-else
-DEBUG = -s
-endif
-
# DB includes + libs
-DBINCL = -I/usr/include/mysql -L/usr/lib/mysql
+DBINCLUDE = -I/usr/include/mysql -L/usr/lib/mysql
DBLIBS = -lmysqlclient
# Linux
-INCLUDE = -I./src/common $(DBINCL)
+INCLUDE = -I./src/common $(DBINCLUDE)
LIBS = -dynamic -lpthread -lrt -ldl $(DBLIBS)
-DEFNIX = -D_LINUX
ifdef NIGHTLY
-NIGHTLYDEFS = -D_NIGHTLYBUILD
-# NIGHTLYDEFS = -D_NIGHTLYBUILD -DTHREAD_TRACK_CALLSTACK
+ NIGHTLYDEFS = -D_NIGHTLYBUILD # -DTHREAD_TRACK_CALLSTACK
endif
ifdef DBG
-DEBUGDEFS = -D_DEBUG -DTHREAD_TRACK_CALLSTACK
-DBGWARN = -Wno-unused-variable
-# DEBUGDEFS = -D_DEBUG -D_PACKETDUMP -D_TESTEXCEPTION -DDEBUG_CRYPT_MSGS
+ DBGDEFS = -D_DEBUG -DTHREAD_TRACK_CALLSTACK # -D_PACKETDUMP -D_TESTEXCEPTION -DDEBUG_CRYPT_MSGS
+ DBGWARN = -ggdb3
endif
-EXTRADEFS = -D_MTNETWORK
-DEFINES = -DGRAY_SVR -D_CONSOLE -D_REENTRANT $(DEFNIX) $(NIGHTLYDEFS) $(EXTRADEFS) $(DEBUGDEFS)
+DEFINES = -D_MTNETWORK $(NIGHTLYDEFS) $(DBGDEFS)
EXE = spheresvr
@@ -48,7 +36,7 @@ CCO = gcc
NO = -fno-rtti -fno-exceptions
EX = -fexceptions -fnon-call-exceptions
-SPECIAL = $(EX) $(DEBUG)
+SPECIAL = -s $(EX) $(DBGWARN)
GITREVISION = $(shell expr $(shell git rev-list --count HEAD) - 2406)
GITHASH = $(shell git rev-parse --short HEAD)
