From 4566b2903f53f77a02b8e675254bfd45370701be Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 31 Dec 2015 20:16:48 -0500 Subject: [PATCH 1/2] windows: PDB files in Debug and Release --- sys/winnt/Makefile.msc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/winnt/Makefile.msc b/sys/winnt/Makefile.msc index c1165ca59..bdfe748e2 100644 --- a/sys/winnt/Makefile.msc +++ b/sys/winnt/Makefile.msc @@ -1,4 +1,4 @@ -# NetHack 3.6 Makefile.msc $NHDT-Date: 1447992736 2015/11/20 04:12:16 $ $NHDT-Branch: master $:$NHDT-Revision: 1.100 $ */ +# NetHack 3.6 Makefile.msc $NHDT-Date: 1451610993 2016/01/01 01:16:33 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.101 $ */ # Copyright (c) NetHack PC Development Team 1993-2015 # #============================================================================== @@ -192,7 +192,7 @@ ccommon= -c -nologo -D"_CONSOLE" -D"_CRT_NONSTDC_NO_DEPRECATE" -D"_CRT_SECURE_NO -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D"NDEBUG" -D"YY_NO_UNISTD_H" -EHsc -fp:precise -Gd -GF -GS -Gy \ $(CL2013) -WX- -Zc:forScope -Zc:wchar_t -Zi cdebug= -analyze- -D"_DEBUG" -Gm -MTd -RTC1 -Od -crelease= -analyze- -D"_MBCS" -errorReport:prompt -GL -Gm- -MT -O2 -Ot -Ox -Oy +crelease= -analyze- -D"_MBCS" -errorReport:prompt -Gm- -MT -O2 -Ot -Ox -Oy lcommon= /NOLOGO /INCREMENTAL:NO @@ -201,7 +201,7 @@ ldebug = /DEBUG cflags1=$(ccommon) $(cdebug) lflags1=$(lcommon) $(ldebug) !ELSE -ldebug= +ldebug= /DEBUG cflags1=$(ccommon) $(crelease) lflags1=$(lcommon) $(ldebug) !ENDIF From 9a5340a3bf050e6a31253fb9c080251874bf6754 Mon Sep 17 00:00:00 2001 From: nhmall Date: Thu, 31 Dec 2015 20:26:47 -0500 Subject: [PATCH 2/2] windows: fix undefined reference in release build Changes to be committed: modified: win/win32/mswproc.c --- win/win32/mswproc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win/win32/mswproc.c b/win/win32/mswproc.c index a259e9fcc..073cd1501 100644 --- a/win/win32/mswproc.c +++ b/win/win32/mswproc.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 mswproc.c $NHDT-Date: 1450453307 2015/12/18 15:41:47 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.97 $ */ +/* NetHack 3.6 mswproc.c $NHDT-Date: 1451611595 2016/01/01 01:26:35 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.98 $ */ /* Copyright (C) 2001 by Alex Kompel */ /* NetHack may be freely redistributed. See license for details. */ @@ -37,7 +37,9 @@ static FILE* _s_debugfp = NULL; extern void logDebug(const char *fmt, ...); # endif -#else +#endif + +#ifndef _DEBUG void logDebug(const char *fmt, ...) {