visual studio project tweaks

2025-11-18 13:44:55 -05:00
parent b1cffe11f9
commit a9d11db853
8 changed files with 162 additions and 115 deletions
--- a/sys/windows/vs/FetchPrereq/fetchprereq.nmake
+++ b/sys/windows/vs/FetchPrereq/fetchprereq.nmake
@@ -33,7 +33,7 @@ SUBMDIR=$(ROOTDIR)\$(SUBMSDIR)

 default: fetchall

-fetchall: libdir fetch-Lua fetch-pdcurses ..\..\..\..\include\nhlua.h
+fetchall: libdir fetch-Lua fetch-pdcurses

 fetch-lua: fetch-actual-Lua

@@ -56,14 +56,6 @@ fetch-pdcurses:
 	cd ..\sys\windows\vs\fetchprereq
 	@echo $(PDCDIST) has been fetched into $(LIBDIR)\$(PDCDIST)

-..\..\..\..\include\nhlua.h:
-	@echo  /* nhlua.h - generated by Makefile from fetchprereq.nmake */ > $@
-	@echo #include "lua.h" >> $@
-	@echo ATTRNORETURN LUA_API int   (lua_error) (lua_State *L) NORETURN; >> $@
-	@echo #include "lualib.h" >> $@
-	@echo #include "lauxlib.h" >> $@
-	@echo /*nhlua.h*/ >> $@
-
 libdir: 
 	@if not exist $(LIBDIR)\*.* echo creating directory $(LIB:\=/)
 	@if not exist $(LIBDIR)\*.* mkdir $(LIBDIR)
--- a/sys/windows/vs/NetHack.sln
+++ b/sys/windows/vs/NetHack.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
-VisualStudioVersion = 18.0.11205.157 d18.0
+VisualStudioVersion = 18.0.11205.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHac
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
 		{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
 		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}
 	EndProjectSection
 EndProject
@@ -26,7 +27,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "makedefs", "makedefs\makedefs.vcxproj", "{BA3DD34C-04B7-40D0-B373-9329AA9E8945}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
-		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover\recover.vcxproj", "{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}"
@@ -41,26 +42,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp\tile2b
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
 		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap\tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
 	ProjectSection(ProjectDependencies) = postProject
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
 		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode\uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
 		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 		{096FD6BB-256A-4E68-9B09-2ACA7C606FF3} = {096FD6BB-256A-4E68-9B09-2ACA7C606FF3}
-		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
 		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}
 		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B} = {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}
 	EndProjectSection
@@ -83,6 +86,8 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hacklib", "hacklib\hacklib.vcxproj", "{096FD6BB-256A-4E68-9B09-2ACA7C606FF3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
+		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fetchprereq", "FetchPrereq\fetchprereq.vcxproj", "{503AE687-C33A-45ED-93AA-83967E176D67}"
@@ -98,6 +103,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "package\package.
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
 		{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5} = {A3B1A65E-4B65-4B67-ADF1-0E38567013A5}
+		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B} = {BAA70D0F-3EC7-4D10-91F0-974F1F49308B}
 		{CEC5D360-8804-454F-8591-002184C23499} = {CEC5D360-8804-454F-8591-002184C23499}
@@ -108,6 +115,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lualib", "lualib\lualib.vcx
 		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhlua_h", "nhlua_h\nhlua_h.vcxproj", "{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{503AE687-C33A-45ED-93AA-83967E176D67} = {503AE687-C33A-45ED-93AA-83967E176D67}
+		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037} = {B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -286,6 +299,18 @@ Global
 		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}.Release|Win32.Build.0 = Release|Win32
 		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}.Release|x64.ActiveCfg = Release|x64
 		{B6B3CC8A-75FD-479C-AB1C-D80FFF0F5037}.Release|x64.Build.0 = Release|x64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|Win32.Build.0 = Debug|Win32
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|x64.ActiveCfg = Debug|x64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Debug|x64.Build.0 = Debug|x64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|ARM64.Build.0 = Release|ARM64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|Win32.ActiveCfg = Release|Win32
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|Win32.Build.0 = Release|Win32
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|x64.ActiveCfg = Release|x64
+		{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/sys/windows/vs/dirs.props
+++ b/sys/windows/vs/dirs.props
@@ -42,23 +42,30 @@
  </PropertyGroup>
  <PropertyGroup>
    <HostTools></HostTools>
+    <Host>$(Platform)</Host>
  </PropertyGroup>
  <PropertyGroup Condition="'$(PROCESSOR_ARCHITECTURE)'=='ARM64'AND '$(Platform)'=='x86'">
    <HostTools>..\ARM64\</HostTools>
+    <Host>arm64</Host>
  </PropertyGroup>
  <PropertyGroup Condition="'$(PROCESSOR_ARCHITECTURE)'=='ARM64'AND '$(Platform)'=='x64'">
    <HostTools>..\ARM64\</HostTools>
+    <Host>arm64</Host>
  </PropertyGroup>
  <PropertyGroup Condition="'$(PROCESSOR_ARCHITECTURE)'=='ARM64'AND '$(Platform)'=='ARM64'">
    <HostTools>..\ARM64\</HostTools>
+    <Host>arm64</Host>
  </PropertyGroup>
  <PropertyGroup Condition="'$(PROCESSOR_ARCHITECTURE)'=='AMD64'AND '$(Platform)'=='x86'">
    <HostTools>..\x64\</HostTools>
+    <Host>x64</Host>
  </PropertyGroup>
  <PropertyGroup Condition="'$(PROCESSOR_ARCHITECTURE)'=='AMD64'AND '$(Platform)'=='x64'">
    <HostTools>..\x64\</HostTools>
+    <Host>x64</Host>
  </PropertyGroup>
  <PropertyGroup Condition="'$(PROCESSOR_ARCHITECTURE)'=='AMD64'AND '$(Platform)'=='ARM64'">
    <HostTools>..\x64\</HostTools>
+    <Host>x64</Host>
  </PropertyGroup>
 </Project>
--- a/sys/windows/vs/hacklib/hacklib.vcxproj
+++ b/sys/windows/vs/hacklib/hacklib.vcxproj
@@ -75,27 +75,25 @@
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -230,15 +228,6 @@
    </Link>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="GenerateHeader" BeforeTargets="ClCompile" Outputs="$(IncDir)\nhlua.h">
-    <Message Text="Generating $(IncDir)nhlua.h" />
-    <Exec Command="echo /* nhlua.h - generated by hacklib.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo #include %22lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo #include %22lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo #include %22lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-  </Target>
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/sys/windows/vs/lualib/lualib.vcxproj
+++ b/sys/windows/vs/lualib/lualib.vcxproj
@@ -40,7 +40,7 @@
  </ItemGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalOptions>/Gs /Oi- /w44774 /w45262 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Gs /w44774 /w45262 %(AdditionalOptions)</AdditionalOptions>
      <DisableSpecificWarnings>4100;4244;4245;4310;4706;4820;4324</DisableSpecificWarnings>
      <Optimization>Disabled</Optimization>
      <OmitFramePointers>true</OmitFramePointers>
@@ -84,45 +84,29 @@
    <ClCompile Include="$(LuaDir)lzio.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+	<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+		<PlatformToolset>v145</PlatformToolset>
+	</PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
+	<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+		<PlatformToolset>v145</PlatformToolset>
+	</PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
@@ -203,7 +187,7 @@
      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;HAS_STDINT_H;HAS_INTTYPES_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Gs /Oi- /w44774 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Gs /w44774 %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
    <Link>
      <SubSystem>
@@ -234,12 +218,13 @@
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
      <SDLCheck>true</SDLCheck>
      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;HAS_STDINT_H;HAS_INTTYPES_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Gs /Oi- /w44774 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Gs /w44774 %(AdditionalOptions)</AdditionalOptions>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
    <Link>
      <SubSystem>
@@ -250,15 +235,6 @@
    </Link>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Target Name="GenerateHeader" BeforeTargets="ClCompile" Outputs="$(IncDir)\nhlua.h">
-    <Message Text="Generating $(IncDir)nhlua.h" />
-    <Exec Command="echo /* nhlua.h - generated by lualib.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo #include %22lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo #include %22lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo #include %22lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-    <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
-  </Target>
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/sys/windows/vs/nhlua_h/nhlua_h.vcxproj
+++ b/sys/windows/vs/nhlua_h/nhlua_h.vcxproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\dirs.props" />
+  <Import Project="..\config.props" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A3B1A65E-4B65-4B67-ADF1-0E38567013A5}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\NetHackProperties.props" />
+  </ImportGroup>
+  <Import Project="..\console.props" />
+  <Import Project="..\common.props" />
+  <Import Project="..\files.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="GenerateHeader" BeforeTargets="ClCompile" Outputs="$(IncDir)\nhlua.h">
+    <Message Text="Generating $(IncDir)nhlua.h" />
+    <Exec Command="echo /* nhlua.h - generated by nhlua_h.vcxproj ClCompile */ &gt; nhlua.h" WorkingDirectory="$(IncDir)" />
+    <Exec Command="echo #include %22lua.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
+    <Exec Command="echo ATTRNORETURN LUA_API int (lua_error) (lua_State *L) NORETURN; &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
+    <Exec Command="echo #include %22lualib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
+    <Exec Command="echo #include %22lauxlib.h%22 &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
+    <Exec Command="echo /*nhlua.h*/ &gt;&gt; nhlua.h" WorkingDirectory="$(IncDir)" />
+  </Target>  <Target Name="AfterBuild">
+  </Target>
+  <Target Name="AfterClean">
+  </Target>
+  <Target Name="AfterRebuild">
+  </Target>
+</Project>
--- a/sys/windows/vs/package/package.nmake
+++ b/sys/windows/vs/package/package.nmake
@@ -21,37 +21,35 @@ NHV=$(NHV:"=)
 #LIBSDIR=lib              # libraries and external bits
 #SUBMSDIR=submodules      # NetHack git submodules
 PACKAGESDIR=vspackage     # put in vspackage to distinguish
-ROOTDIR=..\..\..\..       # root of NetHack tree relative to project file
-PlatformFileName=$(lowercase $(PlatformShortName))
+ROOTDIR=..\..\..\..\       # root of NetHack tree relative to project file
+PlatformFileName=$(lowercase $(PSN))

 # Directories we might have to collect things from
 #
-INCL    = $(ROOTDIR)\include     # NetHack include files
-DAT     = $(ROOTDIR)\dat         # NetHack data files
-DOC     = $(ROOTDIR)\doc         # NetHack documentation files
-UTIL    = $(ROOTDIR)\util        # Utility source
-SRC     = $(ROOTDIR)\src         # Main source
-SSYS    = $(ROOTDIR)\sys\share   # Shared system files
-MSWSYS  = $(ROOTDIR)\sys\windows # MS windows specific files
-TTY     = $(ROOTDIR)\win\tty     # window port files (tty)
-MSWIN   = $(ROOTDIR)\win\win32   # window port files (win32)
-WCURSES = $(ROOTDIR)\win\curses  # window port files (curses)
-WSHR    = $(ROOTDIR)\win\share   # Tile support files
-QT      = $(ROOTDIR)\win\Qt      # QT support files
-X11     = $(ROOTDIR)\win\X11     # X11 support files
-LIBDIR  = $(ROOTDIR)\lib         # libraries and external bits
-SUBMDIR = $(ROOTDIR)\submodules  # NetHack git submodules
-SndWavDir = $(ROOTDIR)\sound\wav # sound files that get integrated
-DocDir  = $(ROOTDIR)\doc
+INCL    = $(ROOTDIR)include     # NetHack include files
+DAT     = $(ROOTDIR)dat         # NetHack data files
+DOC     = $(ROOTDIR)doc         # NetHack documentation files
+UTIL    = $(ROOTDIR)util        # Utility source
+SRC     = $(ROOTDIR)src         # Main source
+SSYS    = $(ROOTDIR)sys\share   # Shared system files
+MSWSYS  = $(ROOTDIR)sys\windows # MS windows specific files
+TTY     = $(ROOTDIR)win\tty     # window port files (tty)
+MSWIN   = $(ROOTDIR)win\win32   # window port files (win32)
+WCURSES = $(ROOTDIR)win\curses  # window port files (curses)
+WSHR    = $(ROOTDIR)win\share   # Tile support files
+QT      = $(ROOTDIR)win\Qt      # QT support files
+X11     = $(ROOTDIR)win\X11     # X11 support files
+LIBDIR  = $(ROOTDIR)lib         # libraries and external bits
+SUBMDIR = $(ROOTDIR)submodules  # NetHack git submodules
+SndWavDir = $(ROOTDIR)sound\wav # sound files that get integrated
+DocDir  = $(ROOTDIR)doc

 # Directories we might place collected things
 #
-VSBINDIR=$(ROOTDIR)\vsbinary
-VSPACKAGEDIR = $(ROOTDIR)\vspackage
+VSBINDIR=$(ROOTDIR)vsbinary
+VSPACKAGEDIR = $(ROOTDIR)vspackage

-
-
-default: packageall
+default: showvar packageall

 #===============================================================================
 # makefile rules
@@ -80,7 +78,7 @@ DBGSYMZIP = $(VSPACKAGEDIR)\nethack-$(NHV)-win-$(PlatformFileName)-debugsymbols.

 packageall: packagezip

-packagezip: showvar vsbindir vspackagedir $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP)
+packagezip: vsbindir vspackagedir $(FILESTOZIP) $(MAINZIP) $(DBGSYMZIP)
 	@echo NetHack Windows package created: $(MAINZIP)

 $(MAINZIP): $(FILESTOZIP)
@@ -90,34 +88,35 @@ $(MAINZIP): $(FILESTOZIP)
 $(DBGSYMZIP): $(PDBTOZIP)
 	tar -a -cf $(DBGSYMZIP) $(PDBTOZIP)

-$(VSBINDIR)\license: $(BinDir)\license
-	copy /Y $(BinDir)\license $@
-$(VSBINDIR)\Guidebook.txt: $(BinDir)\Guidebook.txt
-	copy /Y $(DocDir)\Guidebook.txt $@
-$(VSBINDIR)\NetHack.exe: $(BinDir)\NetHack.exe
-	copy /Y $(BinDir)\NetHack.exe $@
-$(VSBINDIR)\NetHack.txt: $(BinDir)\NetHack.txt
-	copy /Y $(DocDir)\NetHack.txt $@
-$(VSBINDIR)\NetHackW.exe: $(BinDir)\NetHackW.exe
-	copy /Y $(BinDir)\NetHackW.exe $@
-$(VSBINDIR)\opthelp: $(BinDir)\opthelp
-	copy /Y $(BinDir)\opthelp $@
-$(VSBINDIR)\nhdat$(NHV): $(BinDir)\nhdat$(NHV)
+$(VSBINDIR)\license: $(BinDir)license
+	copy /Y $(BinDir)license $@
+$(VSBINDIR)\Guidebook.txt: $(BinDir)Guidebook.txt
+	copy /Y $(DocDir)Guidebook.txt $@
+$(VSBINDIR)\NetHack.exe: $(BinDir)NetHack.exe
+	copy /Y $(BinDir)NetHack.exe $@
+$(VSBINDIR)\NetHack.txt: $(BinDir)NetHack.txt
+	copy /Y $(DocDir)NetHack.txt $@
+$(VSBINDIR)\NetHackW.exe: $(BinDir)NetHackW.exe
+	copy /Y $(BinDir)NetHackW.exe $@
+$(VSBINDIR)\opthelp: $(BinDir)opthelp
+	copy /Y $(BinDir)opthelp $@
+$(VSBINDIR)\nhdat$(NHV): $(BinDir)nhdat$(NHV)
 	copy /Y $(BinDir)\nhdat$(NHV) $@
-$(VSBINDIR)\symbols.template: $(BinDir)\symbols.template
-	copy /Y $(BinDir)\symbols.template $@
-$(VSBINDIR)\nethackrc.template: $(BinDir)\nethackrc.template
-	copy /Y $(BinDir)\nethackrc.template $@
-$(VSBINDIR)\sysconf.template: $(BinDir)\sysconf.template
-	copy /Y $(BinDir)\sysconf.template $@
+$(VSBINDIR)\symbols.template: $(BinDir)symbols.template
+	copy /Y $(BinDir)symbols.template $@
+$(VSBINDIR)\nethackrc.template: $(BinDir)nethackrc.template
+	copy /Y $(BinDir)nethackrc.template $@
+$(VSBINDIR)\sysconf.template: $(BinDir)sysconf.template
+	copy /Y $(BinDir)sysconf.template $@
 $(VSBINDIR)\record:
-	-if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)\record.
+	-if not exist $(VSBINDIR)\record. goto>$(VSBINDIR)record.

 showvar:
 	@echo BinDir=[$(BinDir)]
 	@echo Platform=[$(Platform)]
-	@echo PlatformShortName=[$(PlatformShortName)]
+	@echo PlatformShortName=[$(PSN)]
 	@echo Configuration=[$(Configuration)]
+	@echo Host=[$(Host)]

 vspackagedir:
 	@if not exist $(VSPACKAGEDIR)\*.* echo creating directory $(VSPACKAGEDIR:\=/)
--- a/sys/windows/vs/package/package.vcxproj
+++ b/sys/windows/vs/package/package.vcxproj
@@ -70,7 +70,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake BinDir="$(BinDir)\" Platform="$(Platform)" PlatformShortName="$(PlatformShortName)" Configuration="$(Configuration)" NETHACK_VERSION="$(NETHACK_VERSION)" %26%26 popd</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake BinDir="$(BinDir)\" Configuration="$(Configuration)" Platform="$(Platform)" PSN="$(PlatformShortName)" NETHACK_VERSION="$(NETHACK_VERSION)" Host="$(Host)" %26%26 popd</NMakeBuildCommandLine>
    <NMakeCleanCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake clean %26%26 popd</NMakeCleanCommandLine>
    <NMakeReBuildCommandLine>pushd $(vsDir)package %26%26 nmake /NOLOGO -F package.nmake rebuild %26%26 popd</NMakeReBuildCommandLine>
  </PropertyGroup>