From 49fa532fa8d6b57aebcb682abe98c943348d27dd Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 9 Feb 2024 17:42:12 -0500 Subject: [PATCH] update Windows Makefiles --- sys/windows/Makefile.mingw32 | 2 +- sys/windows/Makefile.nmake | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/windows/Makefile.mingw32 b/sys/windows/Makefile.mingw32 index 3a8af24a1..4a9214b80 100644 --- a/sys/windows/Makefile.mingw32 +++ b/sys/windows/Makefile.mingw32 @@ -795,7 +795,7 @@ else # GIT_AVAILABLE no CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUADST=lua-5.4.6.tar.gz -CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip +CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip CURLPDCDST=pdcurses.zip fetchlua: diff --git a/sys/windows/Makefile.nmake b/sys/windows/Makefile.nmake index f8e56a9ae..db2361b77 100644 --- a/sys/windows/Makefile.nmake +++ b/sys/windows/Makefile.nmake @@ -1,5 +1,5 @@ # NetHack 3.7 Makefile.nmake -# Copyright (c) NetHack Development Team 1993-2023 +# Copyright (c) NetHack Development Team 1993-2024 # #============================================================================== # Build Tools Environment @@ -70,6 +70,13 @@ CURSES_GRAPHICAL = Y DEBUGINFO = Y +# +#------------------------------------------------------------------------------ +# Do you want to include the address sanitizer? +# + +#WANT_ASAN = Y + #------------------------------------------------------------------------------ # # @@ -1046,7 +1053,7 @@ CL_RECENT=-sdl ! ENDIF !ENDIF -!IF ($(VSVER) >= 2019) +!IF ($(VSVER) >= 2019) && ("$(WANT_ASAN)"=="Y") ASAN=/fsanitize=address !ELSE ASAN= @@ -1387,7 +1394,7 @@ CURLLUASRC=http://www.lua.org/ftp/lua-5.4.6.tar.gz CURLLUADST=lua-5.4.6.tar.gz #CURLPDCSRC=https://github.com/wmcbrine/PDCurses/archive/refs/tags/3.9.zip -CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.3.5.zip +CURLPDCSRC=https://github.com/Bill-Gray/PDCursesMod/archive/refs/tags/v4.4.0.zip CURLPDCDST=pdcurses.zip $(LUASRC)\lua.h: