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

recognize visual studio 16.6 (released spring 2020)

Browse Source
This commit is contained in:
nhmall
2020-06-03 13:40:09 -04:00
parent f050d5b140
commit 2c83e2e7e1
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sys/winnt/Makefile.msc
View File

@@ -534,7 +534,7 @@ rc=Rc
# Visual Studio we are using. We set VSVER to 0000 to flag any version that # Visual Studio we are using. We set VSVER to 0000 to flag any version that
# is too old or untested. # is too old or untested.
# #
#NMAKE version 1425286140 is distributed with latest VS 2019 #NMAKE version 1426288060 is distributed with latest VS 2019
#!MESSAGE $(MAKEFLAGS) #!MESSAGE $(MAKEFLAGS)
#!MESSAGE $(MAKEDIR) #!MESSAGE $(MAKEDIR)
@@ -558,19 +558,22 @@ VSVER=2013
VSVER=2015 VSVER=2015
!ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312) !ELSEIF ($(MAKEVERSION) > 1411000000) && ($(MAKEVERSION) < 1416270312)
VSVER=2017 VSVER=2017
!ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1425286141) !ELSEIF ($(MAKEVERSION) > 1416270311) && ($(MAKEVERSION) < 1426288061)
VSVER=$(VSNEWEST) VSVER=$(VSNEWEST)
!ELSEIF ($(MAKEVERSION) > 1421277022) !ELSEIF ($(MAKEVERSION) > 1426288060)
VSVER=2999 #untested future version VSVER=2999 #untested future version
!ENDIF !ENDIF
!IF ($(VSVER) >= 2012) !IF ($(VSVER) >= 2012)
!IF ($(VSVER) <= $(VSNEWEST))
!MESSAGE Autodetected Visual Studio $(VSVER) !MESSAGE Autodetected Visual Studio $(VSVER)
!ELSEIF ($(VSVER) == 2999 !ENDIF
!MESSAGE The version of Visual Studio is newer than the most recent at !ENDIF
!MESSAGE the time this Makefile was crafted (Visual Studio $(VSNEWEST)). !IF ($(VSVER) == 2999)
!MESSAGE Because it is newer we'll proceed expecting that the !MESSAGE The NMAKE version of this Visual Studio $(_NMAKE_VER) is newer than the
!MESSAGE VS$(VSNEWEST) processing will still work. !MESSAGE most recent at the time this Makefile was crafted (Visual Studio $(VSNEWEST)).
!MESSAGE Because it is newer we'll proceed expecting that the VS$(VSNEWEST) processing
!MESSAGE will still work.
!ELSEIF ($(VSVER) == 0000) !ELSEIF ($(VSVER) == 0000)
!MESSAGE The version of Visual Studio appears to be quite old, older !MESSAGE The version of Visual Studio appears to be quite old, older
!MESSAGE than VS2010 which is the oldest supported version by this !MESSAGE than VS2010 which is the oldest supported version by this