]> granicus.if.org Git - nethack/commitdiff
Support both VS 2017 and VS 2019 without making changes to project files.
authorBart House <bhouse@ntdev.microsoft.com>
Sat, 10 Oct 2020 22:15:59 +0000 (15:15 -0700)
committerBart House <bhouse@ntdev.microsoft.com>
Sat, 10 Oct 2020 22:15:59 +0000 (15:15 -0700)
Renamed 'vs2017' folder to 'vs'.

98 files changed:
.travis.yml
Files
sys/winnt/Install.nt
sys/winnt/Makefile.msc
win/win32/vs/.gitattributes [moved from win/win32/vs2017/.gitattributes with 100% similarity]
win/win32/vs/.gitignore [moved from win/win32/vs2017/.gitignore with 100% similarity]
win/win32/vs/Images/BadgeLogo.scale-100.png [moved from win/win32/vs2017/Images/BadgeLogo.scale-100.png with 100% similarity]
win/win32/vs/Images/BadgeLogo.scale-125.png [moved from win/win32/vs2017/Images/BadgeLogo.scale-125.png with 100% similarity]
win/win32/vs/Images/BadgeLogo.scale-150.png [moved from win/win32/vs2017/Images/BadgeLogo.scale-150.png with 100% similarity]
win/win32/vs/Images/BadgeLogo.scale-200.png [moved from win/win32/vs2017/Images/BadgeLogo.scale-200.png with 100% similarity]
win/win32/vs/Images/BadgeLogo.scale-400.png [moved from win/win32/vs2017/Images/BadgeLogo.scale-400.png with 100% similarity]
win/win32/vs/Images/LargeTile.scale-100.png [moved from win/win32/vs2017/Images/LargeTile.scale-100.png with 100% similarity]
win/win32/vs/Images/LargeTile.scale-125.png [moved from win/win32/vs2017/Images/LargeTile.scale-125.png with 100% similarity]
win/win32/vs/Images/LargeTile.scale-150.png [moved from win/win32/vs2017/Images/LargeTile.scale-150.png with 100% similarity]
win/win32/vs/Images/LargeTile.scale-200.png [moved from win/win32/vs2017/Images/LargeTile.scale-200.png with 100% similarity]
win/win32/vs/Images/LargeTile.scale-400.png [moved from win/win32/vs2017/Images/LargeTile.scale-400.png with 100% similarity]
win/win32/vs/Images/LockScreenLogo.scale-200.png [moved from win/win32/vs2017/Images/LockScreenLogo.scale-200.png with 100% similarity]
win/win32/vs/Images/SmallTile.scale-100.png [moved from win/win32/vs2017/Images/SmallTile.scale-100.png with 100% similarity]
win/win32/vs/Images/SmallTile.scale-125.png [moved from win/win32/vs2017/Images/SmallTile.scale-125.png with 100% similarity]
win/win32/vs/Images/SmallTile.scale-150.png [moved from win/win32/vs2017/Images/SmallTile.scale-150.png with 100% similarity]
win/win32/vs/Images/SmallTile.scale-200.png [moved from win/win32/vs2017/Images/SmallTile.scale-200.png with 100% similarity]
win/win32/vs/Images/SmallTile.scale-400.png [moved from win/win32/vs2017/Images/SmallTile.scale-400.png with 100% similarity]
win/win32/vs/Images/SplashScreen.scale-100.png [moved from win/win32/vs2017/Images/SplashScreen.scale-100.png with 100% similarity]
win/win32/vs/Images/SplashScreen.scale-125.png [moved from win/win32/vs2017/Images/SplashScreen.scale-125.png with 100% similarity]
win/win32/vs/Images/SplashScreen.scale-150.png [moved from win/win32/vs2017/Images/SplashScreen.scale-150.png with 100% similarity]
win/win32/vs/Images/SplashScreen.scale-200.png [moved from win/win32/vs2017/Images/SplashScreen.scale-200.png with 100% similarity]
win/win32/vs/Images/SplashScreen.scale-400.png [moved from win/win32/vs2017/Images/SplashScreen.scale-400.png with 100% similarity]
win/win32/vs/Images/Square150x150Logo.scale-100.png [moved from win/win32/vs2017/Images/Square150x150Logo.scale-100.png with 100% similarity]
win/win32/vs/Images/Square150x150Logo.scale-125.png [moved from win/win32/vs2017/Images/Square150x150Logo.scale-125.png with 100% similarity]
win/win32/vs/Images/Square150x150Logo.scale-150.png [moved from win/win32/vs2017/Images/Square150x150Logo.scale-150.png with 100% similarity]
win/win32/vs/Images/Square150x150Logo.scale-200.png [moved from win/win32/vs2017/Images/Square150x150Logo.scale-200.png with 100% similarity]
win/win32/vs/Images/Square150x150Logo.scale-400.png [moved from win/win32/vs2017/Images/Square150x150Logo.scale-400.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-16.png [moved from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-16.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-256.png [moved from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-256.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-32.png [moved from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-32.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.altform-unplated_targetsize-48.png [moved from win/win32/vs2017/Images/Square44x44Logo.altform-unplated_targetsize-48.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.scale-100.png [moved from win/win32/vs2017/Images/Square44x44Logo.scale-100.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.scale-125.png [moved from win/win32/vs2017/Images/Square44x44Logo.scale-125.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.scale-150.png [moved from win/win32/vs2017/Images/Square44x44Logo.scale-150.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.scale-200.png [moved from win/win32/vs2017/Images/Square44x44Logo.scale-200.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.scale-400.png [moved from win/win32/vs2017/Images/Square44x44Logo.scale-400.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.targetsize-16.png [moved from win/win32/vs2017/Images/Square44x44Logo.targetsize-16.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.targetsize-24.png [moved from win/win32/vs2017/Images/Square44x44Logo.targetsize-24.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.targetsize-24_altform-unplated.png [moved from win/win32/vs2017/Images/Square44x44Logo.targetsize-24_altform-unplated.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.targetsize-256.png [moved from win/win32/vs2017/Images/Square44x44Logo.targetsize-256.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.targetsize-32.png [moved from win/win32/vs2017/Images/Square44x44Logo.targetsize-32.png with 100% similarity]
win/win32/vs/Images/Square44x44Logo.targetsize-48.png [moved from win/win32/vs2017/Images/Square44x44Logo.targetsize-48.png with 100% similarity]
win/win32/vs/Images/StoreLogo.backup.png [moved from win/win32/vs2017/Images/StoreLogo.backup.png with 100% similarity]
win/win32/vs/Images/StoreLogo.scale-100.png [moved from win/win32/vs2017/Images/StoreLogo.scale-100.png with 100% similarity]
win/win32/vs/Images/StoreLogo.scale-125.png [moved from win/win32/vs2017/Images/StoreLogo.scale-125.png with 100% similarity]
win/win32/vs/Images/StoreLogo.scale-150.png [moved from win/win32/vs2017/Images/StoreLogo.scale-150.png with 100% similarity]
win/win32/vs/Images/StoreLogo.scale-200.png [moved from win/win32/vs2017/Images/StoreLogo.scale-200.png with 100% similarity]
win/win32/vs/Images/StoreLogo.scale-400.png [moved from win/win32/vs2017/Images/StoreLogo.scale-400.png with 100% similarity]
win/win32/vs/Images/Wide310x150Logo.scale-100.png [moved from win/win32/vs2017/Images/Wide310x150Logo.scale-100.png with 100% similarity]
win/win32/vs/Images/Wide310x150Logo.scale-125.png [moved from win/win32/vs2017/Images/Wide310x150Logo.scale-125.png with 100% similarity]
win/win32/vs/Images/Wide310x150Logo.scale-150.png [moved from win/win32/vs2017/Images/Wide310x150Logo.scale-150.png with 100% similarity]
win/win32/vs/Images/Wide310x150Logo.scale-200.png [moved from win/win32/vs2017/Images/Wide310x150Logo.scale-200.png with 100% similarity]
win/win32/vs/Images/Wide310x150Logo.scale-400.png [moved from win/win32/vs2017/Images/Wide310x150Logo.scale-400.png with 100% similarity]
win/win32/vs/NetHack.sln [moved from win/win32/vs2017/NetHack.sln with 100% similarity]
win/win32/vs/NetHack.vcxproj [moved from win/win32/vs2017/NetHack.vcxproj with 100% similarity]
win/win32/vs/NetHackPackage.appxmanifest [moved from win/win32/vs2017/NetHackPackage.appxmanifest with 100% similarity]
win/win32/vs/NetHackPackage.wapproj [moved from win/win32/vs2017/NetHackPackage.wapproj with 100% similarity]
win/win32/vs/NetHackProperties.props [moved from win/win32/vs2017/NetHackProperties.props with 100% similarity]
win/win32/vs/NetHackW.vcxproj [moved from win/win32/vs2017/NetHackW.vcxproj with 100% similarity]
win/win32/vs/PDCurses.vcxproj [moved from win/win32/vs2017/PDCurses.vcxproj with 100% similarity]
win/win32/vs/Package.StoreAssociation.xml [moved from win/win32/vs2017/Package.StoreAssociation.xml with 100% similarity]
win/win32/vs/ScreenShot.PNG [moved from win/win32/vs2017/ScreenShot.PNG with 100% similarity]
win/win32/vs/afterdlb.proj [moved from win/win32/vs2017/afterdlb.proj with 100% similarity]
win/win32/vs/aftermakedefs.proj [moved from win/win32/vs2017/aftermakedefs.proj with 100% similarity]
win/win32/vs/afternethack.proj [moved from win/win32/vs2017/afternethack.proj with 100% similarity]
win/win32/vs/afterrecover.proj [moved from win/win32/vs2017/afterrecover.proj with 100% similarity]
win/win32/vs/aftertile2bmp.proj [moved from win/win32/vs2017/aftertile2bmp.proj with 100% similarity]
win/win32/vs/aftertilemap.proj [moved from win/win32/vs2017/aftertilemap.proj with 100% similarity]
win/win32/vs/afteruudecode.proj [moved from win/win32/vs2017/afteruudecode.proj with 100% similarity]
win/win32/vs/build.bat [moved from win/win32/vs2017/build.bat with 100% similarity]
win/win32/vs/common.props [moved from win/win32/vs2017/common.props with 100% similarity]
win/win32/vs/config.props [moved from win/win32/vs2017/config.props with 100% similarity]
win/win32/vs/console.props [moved from win/win32/vs2017/console.props with 100% similarity]
win/win32/vs/default.props [moved from win/win32/vs2017/default.props with 91% similarity]
win/win32/vs/default_dll.props [moved from win/win32/vs2017/default_dll.props with 90% similarity]
win/win32/vs/default_lib.props [moved from win/win32/vs2017/default_lib.props with 90% similarity]
win/win32/vs/dirs.props [moved from win/win32/vs2017/dirs.props with 100% similarity]
win/win32/vs/dlb.vcxproj [moved from win/win32/vs2017/dlb.vcxproj with 100% similarity]
win/win32/vs/dll.props [moved from win/win32/vs2017/dll.props with 100% similarity]
win/win32/vs/files.props [moved from win/win32/vs2017/files.props with 100% similarity]
win/win32/vs/makedefs.vcxproj [moved from win/win32/vs2017/makedefs.vcxproj with 100% similarity]
win/win32/vs/nh340key.def [moved from win/win32/vs2017/nh340key.def with 100% similarity]
win/win32/vs/nh340key.vcxproj [moved from win/win32/vs2017/nh340key.vcxproj with 100% similarity]
win/win32/vs/nhdefkey.def [moved from win/win32/vs2017/nhdefkey.def with 100% similarity]
win/win32/vs/nhdefkey.vcxproj [moved from win/win32/vs2017/nhdefkey.vcxproj with 100% similarity]
win/win32/vs/nhraykey.def [moved from win/win32/vs2017/nhraykey.def with 100% similarity]
win/win32/vs/nhraykey.vcxproj [moved from win/win32/vs2017/nhraykey.vcxproj with 100% similarity]
win/win32/vs/recover.vcxproj [moved from win/win32/vs2017/recover.vcxproj with 100% similarity]
win/win32/vs/tile2bmp.vcxproj [moved from win/win32/vs2017/tile2bmp.vcxproj with 100% similarity]
win/win32/vs/tilemap.vcxproj [moved from win/win32/vs2017/tilemap.vcxproj with 100% similarity]
win/win32/vs/tiles.vcxproj [moved from win/win32/vs2017/tiles.vcxproj with 100% similarity]
win/win32/vs/travisci.sh [moved from win/win32/vs2017/travisci.sh with 100% similarity]
win/win32/vs/uudecode.vcxproj [moved from win/win32/vs2017/uudecode.vcxproj with 100% similarity]

index 0b1e388a0f9bdd1a4605979cbdf1ac683aa9b3e1..ceba99f721f0f971169e32473b0fc5091425bde1 100644 (file)
@@ -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
diff --git a/Files b/Files
index 9aedfce0c3f697e00fb4284191e6048850737c72..5eb31b35acd88fb055848cdad31a9905e6287837 100644 (file)
--- a/Files
+++ b/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,7 +452,7 @@ recover.vcxproj               tile2bmp.vcxproj
 tilemap.vcxproj               tiles.vcxproj
 travisci.sh                   uudecode.vcxproj
 
-win/win32/vs2017/Images:
+win/win32/vs/Images:
 (files for Visual Studio 2017 Community Edition builds)
 BadgeLogo.scale-100.png
 BadgeLogo.scale-125.png
index 98bd029d4f60a46fbe53172d28205d236efa2f83..5deb4dccbe258708506910d0d8d6ebbefdd6336a 100644 (file)
@@ -49,10 +49,10 @@ 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  |
 \--------------------------------------------------------/
 
 Before proceeding, please obtain the lua-5.4.0 sources and copy them to
@@ -61,23 +61,15 @@ 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 IDE, or you prefer to build
+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
@@ -94,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 *
 
index 546d346e48929f20c4b44f4c3b54cfa19909dd3d..d079e64dbcb30f3fd13d8b0b3ee69c15f8974be1 100644 (file)
@@ -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
similarity index 91%
rename from win/win32/vs2017/default.props
rename to win/win32/vs/default.props
index e0bc58136a7d3084477e4022f01f939cae94f746..a8b166609539e5958686c8b8dc7d1cc3b7f5a510 100644 (file)
@@ -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>
similarity index 90%
rename from win/win32/vs2017/default_dll.props
rename to win/win32/vs/default_dll.props
index 51d90a3ee67ecd9dfdaea0e9a5902a1c9b721afe..cf130695899031a77f717b7f4e9d3366758c4ff0 100644 (file)
@@ -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>
similarity index 90%
rename from win/win32/vs2017/default_lib.props
rename to win/win32/vs/default_lib.props
index 61bf2ecaa67b94e5b40f3863b106966642428cf8..ce33f4abc80ff14562226a975952d5b6664135f2 100644 (file)
@@ -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>