nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Windows build warning and Makefile update

Browse Source 
.\hack.c(2657): warning C4389: '!=': signed/unsigned mismatch
Visual Studio autodetection update for Makefile.msc
This commit is contained in:
nhmall
2021-06-04 00:14:37 -04:00
parent d27c507c16
commit 254c6c55f5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hack.c
+1 -1
View File
@@ -2654,7 +2654,7 @@ check_special_room(boolean newlev)
if (DEADMONSTER(mtmp)) if (DEADMONSTER(mtmp))
continue; continue;
if (!isok(mtmp->mx,mtmp->my) if (!isok(mtmp->mx,mtmp->my)
|| roomno != levl[mtmp->mx][mtmp->my].roomno) || roomno != (int) levl[mtmp->mx][mtmp->my].roomno)
continue; continue;
if (!Stealth && !rn2(3)) if (!Stealth && !rn2(3))
mtmp->msleeping = 0; mtmp->msleeping = 0;
sys/windows/Makefile.msc
+3 -2
View File
@@ -548,6 +548,7 @@ rc=Rc
# is too old or untested. # is too old or untested.
# #
#NMAKE version 1428293370 from latest VS 2019 (Feb 9, 2021 version 16.8.5) #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 $(MAKEFLAGS)
#!MESSAGE $(MAKEDIR) #!MESSAGE $(MAKEDIR)
@@ -571,9 +572,9 @@ VSVER=2013
VSVER=2015 VSVER=2015
!ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312) !ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312)
VSVER=2017 VSVER=2017
!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1428293371) !ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1429300371)
VSVER=$(VSNEWEST) VSVER=$(VSNEWEST)
!ELSEIF ($(MAKEVERSION) > 1428293370) !ELSEIF ($(MAKEVERSION) > 1429300370)
VSVER=2999 #untested future version VSVER=2999 #untested future version
!ENDIF !ENDIF