From: nhmall <nhmall@nethack.org>
Date: Fri, 4 Jun 2021 04:14:37 +0000 (-0400)
Subject: Windows build warning and Makefile update
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=254c6c55f5b163b343d08bd915334e8f1f3b29a7;p=nethack

Windows build warning and Makefile update

.\hack.c(2657): warning C4389: '!=': signed/unsigned mismatch
Visual Studio autodetection update for Makefile.msc
---

diff --git a/src/hack.c b/src/hack.c
index 838cbe614..8c9bd6148 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -2654,7 +2654,7 @@ check_special_room(boolean newlev)
                     if (DEADMONSTER(mtmp))
                         continue;
                     if (!isok(mtmp->mx,mtmp->my)
-                        || roomno != levl[mtmp->mx][mtmp->my].roomno)
+                        || roomno != (int) levl[mtmp->mx][mtmp->my].roomno)
                         continue;
                     if (!Stealth && !rn2(3))
                         mtmp->msleeping = 0;
diff --git a/sys/windows/Makefile.msc b/sys/windows/Makefile.msc
index dfd049ad9..2938bc137 100644
--- a/sys/windows/Makefile.msc
+++ b/sys/windows/Makefile.msc
@@ -548,6 +548,7 @@ rc=Rc
 # is too old or untested.
 #
 #NMAKE version 1428293370 from latest VS 2019 (Feb 9, 2021 version 16.8.5)
+#NMAKE version 1429300370 from latest VS 2019 (May 25, 2021 version 16.10.0)
 
 #!MESSAGE $(MAKEFLAGS)
 #!MESSAGE $(MAKEDIR)
@@ -571,9 +572,9 @@ VSVER=2013
 VSVER=2015
 !ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312)
 VSVER=2017
-!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1428293371)
+!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1429300371)
 VSVER=$(VSNEWEST)
-!ELSEIF ($(MAKEVERSION) > 1428293370)
+!ELSEIF ($(MAKEVERSION) > 1429300370)
 VSVER=2999              #untested future version
 !ENDIF