windows console changes - eliminate *key.dll

Incorporate the functionality of the loadable DLL's (nhraykey.dll, nhdefkey.dll, and nh340key.dll) into the consoletty.c code and remove the dll building
2021-11-16 15:27:33 -05:00
parent 6c8a03aa44
commit 0a97cc5c5e
22 changed files with 1358 additions and 1928 deletions
--- 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 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW\NetHackW.vcxproj", "{CEC5D360-8804-454F-8591-002184C23499}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -41,25 +41,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack\NetHack.
 	ProjectSection(ProjectDependencies) = postProject
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
-		{6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385}
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey\nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nh340key", "nh340key\nh340key.vcxproj", "{BE04E242-A1E9-4593-B95B-057F37330B76}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey\nhraykey.vcxproj", "{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses\PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{477BF231-48E0-4312-AA12-9D8576215489}"
@@ -141,30 +125,6 @@ Global
 		{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|Win32.Build.0 = Release|Win32
 		{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.ActiveCfg = Release|x64
 		{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}.Release|x64.Build.0 = Release|x64
-		{6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6813477F-64B6-4B97-B230-438D0D233385}.Debug|Win32.Build.0 = Debug|Win32
-		{6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.ActiveCfg = Debug|x64
-		{6813477F-64B6-4B97-B230-438D0D233385}.Debug|x64.Build.0 = Debug|x64
-		{6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.ActiveCfg = Release|Win32
-		{6813477F-64B6-4B97-B230-438D0D233385}.Release|Win32.Build.0 = Release|Win32
-		{6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.ActiveCfg = Release|x64
-		{6813477F-64B6-4B97-B230-438D0D233385}.Release|x64.Build.0 = Release|x64
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|Win32.Build.0 = Debug|Win32
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.ActiveCfg = Debug|x64
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Debug|x64.Build.0 = Debug|x64
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.ActiveCfg = Release|Win32
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|Win32.Build.0 = Release|Win32
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.ActiveCfg = Release|x64
-		{BE04E242-A1E9-4593-B95B-057F37330B76}.Release|x64.Build.0 = Release|x64
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|Win32.Build.0 = Debug|Win32
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.ActiveCfg = Debug|x64
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Debug|x64.Build.0 = Debug|x64
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.ActiveCfg = Release|Win32
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|Win32.Build.0 = Release|Win32
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.ActiveCfg = Release|x64
-		{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}.Release|x64.Build.0 = Release|x64
 		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|Win32.Build.0 = Debug|Win32
 		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|x64.ActiveCfg = Debug|x64
--- a/sys/windows/vs/nh340key/nh340key.def
+++ b/sys/windows/vs/nh340key/nh340key.def
@@ -1,8 +0,0 @@
-LIBRARY nh340key
-EXPORTS
-ProcessKeystroke
-NHkbhit
-CheckInput
-SourceWhere
-SourceAuthor
-KeyHandlerName
--- a/sys/windows/vs/nh340key/nh340key.vcxproj
+++ b/sys/windows/vs/nh340key/nh340key.vcxproj
@@ -1,54 +0,0 @@
-<?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="$(vsDir)config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BE04E242-A1E9-4593-B95B-057F37330B76}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>nh340key</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default_dll.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <Import Project="$(vsDir)dll.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <Link>
-      <ModuleDefinitionFile>nh340key.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SysWindDir)nh340key.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(IncDir)hack.h" />
-    <ClInclude Include="$(IncDir)windconf.h" />
-    <ClInclude Include="$(IncDir)wintty.h" />
-    <ClInclude Include="$(SysWindDir)win32api.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
--- a/sys/windows/vs/nhdefkey/nhdefkey.def
+++ b/sys/windows/vs/nhdefkey/nhdefkey.def
@@ -1,8 +0,0 @@
-LIBRARY nhdefkey
-EXPORTS
-ProcessKeystroke
-NHkbhit
-CheckInput
-SourceWhere
-SourceAuthor
-KeyHandlerName
--- a/sys/windows/vs/nhdefkey/nhdefkey.vcxproj
+++ b/sys/windows/vs/nhdefkey/nhdefkey.vcxproj
@@ -1,54 +0,0 @@
-<?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="$(vsDir)config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6813477F-64B6-4B97-B230-438D0D233385}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>nhdefkey</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default_dll.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <Import Project="$(vsDir)dll.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <Link>
-      <ModuleDefinitionFile>nhdefkey.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SysWindDir)nhdefkey.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(IncDir)hack.h" />
-    <ClInclude Include="$(IncDir)windconf.h" />
-    <ClInclude Include="$(IncDir)wintty.h" />
-    <ClInclude Include="$(SysWindDir)win32api.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
--- a/sys/windows/vs/nhraykey/nhraykey.def
+++ b/sys/windows/vs/nhraykey/nhraykey.def
@@ -1,8 +0,0 @@
-LIBRARY nhraykey
-EXPORTS
-ProcessKeystroke
-NHkbhit
-CheckInput
-SourceWhere
-SourceAuthor
-KeyHandlerName
--- a/sys/windows/vs/nhraykey/nhraykey.vcxproj
+++ b/sys/windows/vs/nhraykey/nhraykey.vcxproj
@@ -1,54 +0,0 @@
-<?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="$(vsDir)config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2E1F4BB3-3BD7-43AD-8E64-D3B8A2F5D7B2}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>nhraykey</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(vsDir)default_dll.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(vsDir)NetHackProperties.props" />
-  </ImportGroup>
-  <Import Project="$(vsDir)dll.props" />
-  <Import Project="$(vsDir)common.props" />
-  <Import Project="$(vsDir)files.props" />
-  <PropertyGroup>
-    <OutDir>$(BinDir)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWindDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <Link>
-      <ModuleDefinitionFile>nhraykey.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SysWindDir)nhraykey.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(IncDir)hack.h" />
-    <ClInclude Include="$(IncDir)windconf.h" />
-    <ClInclude Include="$(IncDir)wintty.h" />
-    <ClInclude Include="$(SysWindDir)win32api.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>