mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-29 07:32:02 +00:00
Fixup DEBUGMODE builds
doomdef.h: check if the build system already define our DEBUG code version.mk: do not fail on our inline functions in DEBUGMODE features.mk: we do not need the VALGRIND libraies, just the headers mserv.c: start registered with false in Update_parameters()
This commit is contained in:
parent
8fefb8a87b
commit
5b6c24281d
4 changed files with 13 additions and 1 deletions
|
@ -61,6 +61,7 @@ endif
|
||||||
# (Valgrind is a memory debugger.)
|
# (Valgrind is a memory debugger.)
|
||||||
ifdef VALGRIND
|
ifdef VALGRIND
|
||||||
VALGRIND_PKGCONFIG?=valgrind
|
VALGRIND_PKGCONFIG?=valgrind
|
||||||
|
VALGRIND_LDFLAGS=
|
||||||
$(eval $(call Use_pkg_config,VALGRIND))
|
$(eval $(call Use_pkg_config,VALGRIND))
|
||||||
ZDEBUG=1
|
ZDEBUG=1
|
||||||
opts+=-DHAVE_VALGRIND
|
opts+=-DHAVE_VALGRIND
|
||||||
|
|
|
@ -84,6 +84,9 @@ endif
|
||||||
WFLAGS+=-Wnested-externs
|
WFLAGS+=-Wnested-externs
|
||||||
#WFLAGS+=-Wunreachable-code
|
#WFLAGS+=-Wunreachable-code
|
||||||
WFLAGS+=-Winline
|
WFLAGS+=-Winline
|
||||||
|
ifdef DEBUGMODE
|
||||||
|
WFLAGS+=-Wno-error=inline
|
||||||
|
endif
|
||||||
ifdef GCC43
|
ifdef GCC43
|
||||||
WFLAGS+=-funit-at-a-time
|
WFLAGS+=-funit-at-a-time
|
||||||
WFLAGS+=-Wlogical-op
|
WFLAGS+=-Wlogical-op
|
||||||
|
|
|
@ -110,11 +110,19 @@ FILE *fopenfile(const char*, const char*);
|
||||||
|
|
||||||
// If you don't disable ALL debug first, you get ALL debug enabled
|
// If you don't disable ALL debug first, you get ALL debug enabled
|
||||||
#if !defined (NDEBUG)
|
#if !defined (NDEBUG)
|
||||||
|
#ifndef PACKETDROP
|
||||||
#define PACKETDROP
|
#define PACKETDROP
|
||||||
|
#endif
|
||||||
|
#ifndef PARANOIA
|
||||||
#define PARANOIA
|
#define PARANOIA
|
||||||
|
#endif
|
||||||
|
#ifndef RANGECHECK
|
||||||
#define RANGECHECK
|
#define RANGECHECK
|
||||||
|
#endif
|
||||||
|
#ifndef ZDEBUG
|
||||||
#define ZDEBUG
|
#define ZDEBUG
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
// Uncheck this to compile debugging code
|
// Uncheck this to compile debugging code
|
||||||
//#define RANGECHECK
|
//#define RANGECHECK
|
||||||
|
|
|
@ -506,7 +506,7 @@ static void
|
||||||
Update_parameters (void)
|
Update_parameters (void)
|
||||||
{
|
{
|
||||||
#ifdef MASTERSERVER
|
#ifdef MASTERSERVER
|
||||||
int registered;
|
int registered = 0;
|
||||||
int delayed;
|
int delayed;
|
||||||
|
|
||||||
if (Online())
|
if (Online())
|
||||||
|
|
Loading…
Reference in a new issue