Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

.travis.yml

@@ -122,7 +122,7 @@ matrix:
       os: windows
       language: shell
       script:
-        - ./win/win32/vs2017/travisci.sh
+        - ./win/win32/vs/travisci.sh
     - name: windows-mingw
       os: windows
 #     install: choco install mingw

Files

@@ -429,8 +429,8 @@ record.uu              resource.h             rip.uu
 splash.uu              tiles-mingw32.mak      tiles.mak
 winMS.h
 
-win/win32/vs2017:
-(files for Visual Studio 2017 Community Edition builds)
+win/win32/vs:
+(files for Visual Studio 2017 or 2019 Community Edition builds)
 NetHack.sln                   NetHack.vcxproj
 NetHackPackage.appxmanifest   NetHackPackage.wapproj
 NetHackProperties.props       NetHackW.vcxproj
@@ -452,8 +452,8 @@ recover.vcxproj               tile2bmp.vcxproj
 tilemap.vcxproj               tiles.vcxproj
 travisci.sh                   uudecode.vcxproj
 
-win/win32/vs2017/Images:
-(files for Visual Studio 2017 Community Edition builds)
+win/win32/vs/Images:
+(files for Visual Studio 2017 or 2019 Community Edition builds)
 BadgeLogo.scale-100.png
 BadgeLogo.scale-125.png
 BadgeLogo.scale-150.png

sys/winnt/Install.nt

@@ -49,30 +49,27 @@ version.  You can use one of the following build environments:
                                  |    |    |      |        |           |
                              share  winnt tty   win32  Lua-5.4.0    pdcurses
                                                   |
-                                               vs2017
+                                                 vs
 
- 
 /--------------------------------------------------------\
-| Building And Running Using Visual Studio 2017          |
+| Building And Running Using Visual Studio 2017 or 2019  |
 \--------------------------------------------------------/
 
-If you are NOT using Visual Studio 2017 IDE, or you prefer to build
+Before proceeding, please obtain the lua-5.4.0 sources and copy them to
+the new directory lib\lua-5.4.0\src.  This source can be obtain either from
+http://www.lua.org/ftp/lua-5.4.0.tar.gz or from the git hub mirror
+https://github.com/lua/lua.git using the tag 'v5.4.0'.  The build expects
+to find lua files such as 'lua.h' at 'lib\lua-5.4.0\src\lua.h'.
+
+If you are NOT using Visual Studio 2017 or 2019 IDE, or you prefer to build
 using a Make utility and a Makefile proceed to "Building Using Make".
 
-When using either Visual Studio 2017, you simply need to load the
+When using either Visual Studio 2017 or 2019, you simply need to load the
 solution file within the IDE, build the solution and  run the version
 of NetHack you wish to run.
 
-The Visual Studio 2017 NetHack solution file can be found here:
-    win\win32\vs2017\NetHack.sln
-
-You can use that same win\win32\vs2017\NetHack.sln with Visual Studio 2019,
-but you may have to retarget the projects:
-    Windows SDK Version: 10.0.17763.0  [ There have been some reports of 
-                                         difficulties if you instead choose 
-                                         "10.0 (latest installed version)" ]
-    Platform Toolset: Upgrade to v142
-    
+The Visual Studio NetHack solution file can be found here:
+    win\win32\vs\NetHack.sln
 
 Before executing the steps to build listed in the next paragraph,
 decide if you want to include optional curses window-port. See
@@ -89,7 +86,7 @@ You can also build all the projects for all platforms and configurations
 using a "build.bat" batch file found in the same directory as the solution.
 
 Open a developer command prompt for the version of Visual Studio you are
-using.  Change to the directory win\win32\vs2017 and run "build.bat".
+using.  Change to the directory win\win32\vs and run "build.bat".
 
  * Optional curses window-port support *
 

sys/winnt/Makefile.msc

@@ -593,7 +593,7 @@ VSVER=2999              #untested future version
 !include <win32.mak>
 ! ENDIF
 
-#These will be in the environment variables with one of the VS2017
+#These will be in the environment variables with one of the Visual Studio
 #developer command prompts.
 #VSCMD_ARG_HOST_ARCH=x64
 #VSCMD_ARG_TGT_ARCH=x86

win/win32/vs/.gitattributes

@@ -0,0 +1 @@
+* NH_filestag=(file%s_for_Visual_Studio_2017_or_2019_Community_Edition_builds)

win/win32/vs/default.props

@@ -4,7 +4,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <LocalDebuggerWorkingDirectory>$(BinDir)</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" >
@@ -14,5 +14,4 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-
 </Project>

win/win32/vs/default_dll.props

@@ -4,7 +4,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" >
     <UseDebugLibraries>true</UseDebugLibraries>

win/win32/vs/default_lib.props

@@ -4,7 +4,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" >
     <UseDebugLibraries>true</UseDebugLibraries>

win/win32/vs2017/.gitattributes

@@ -1 +0,0 @@
-* NH_filestag=(file%s_for_Visual_Studio_2017_Community_Edition_builds)