From 6cec6a88a54351ca72a5b430cebd195deacc2f70 Mon Sep 17 00:00:00 2001
From: Bart House <bart@barthouse.com>
Date: Sat, 15 Dec 2018 17:35:27 -0800
Subject: [PATCH] Added PDCurses project to VS 2017 build.

---
 win/win32/vs2017/NetHack.sln       |  10 +++
 win/win32/vs2017/NetHack.vcxproj   |   2 +-
 win/win32/vs2017/PDCurses.vcxproj  | 120 +++++++++++++++++++++++++++++
 win/win32/vs2017/default_lib.props |  17 ++++
 4 files changed, 148 insertions(+), 1 deletion(-)
 create mode 100644 win/win32/vs2017/PDCurses.vcxproj
 create mode 100644 win/win32/vs2017/default_lib.props

diff --git a/win/win32/vs2017/NetHack.sln b/win/win32/vs2017/NetHack.sln
index a64b1cba1..8c9e1e701 100644
--- a/win/win32/vs2017/NetHack.sln
+++ b/win/win32/vs2017/NetHack.sln
@@ -78,6 +78,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhraykey", "nhraykey.vcxpro
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PDCurses", "PDCurses.vcxproj", "{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -190,6 +192,14 @@ Global
 		{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
+		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Debug|x64.Build.0 = Debug|x64
+		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|Win32.ActiveCfg = Release|Win32
+		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|Win32.Build.0 = Release|Win32
+		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|x64.ActiveCfg = Release|x64
+		{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj
index 1e114f64f..d5feb73b7 100644
--- a/win/win32/vs2017/NetHack.vcxproj
+++ b/win/win32/vs2017/NetHack.vcxproj
@@ -22,7 +22,7 @@
 	  <PreprocessorDefinitions>CURSES_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
 	<Link>
-      <AdditionalLibraryDirectories>$(PDCURSES)\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(ToolsDir)</AdditionalLibraryDirectories>
       <AdditionalDependencies>PDCurses.lib;%(AdditionalDependencies)</AdditionalDependencies>
 	  </Link>
   </ItemDefinitionGroup>
diff --git a/win/win32/vs2017/PDCurses.vcxproj b/win/win32/vs2017/PDCurses.vcxproj
new file mode 100644
index 000000000..e77f33b6a
--- /dev/null
+++ b/win/win32/vs2017/PDCurses.vcxproj
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="config.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BAA70D0F-3EC7-4D10-91F0-974F1F49308B}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>PDCurses</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="default_lib.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="dirs.props" />
+  <ItemGroup>
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addch.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addchstr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\addstr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\attr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\beep.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\bkgd.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\border.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\clear.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\color.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\debug.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\delch.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\deleteln.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\deprec.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\getch.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\getstr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\getyx.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\inch.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\inchstr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\initscr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\inopts.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\insch.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\insstr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\kernel.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\keyname.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\mouse.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\move.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\outopts.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\overlay.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\pad.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\panel.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\printw.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\refresh.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\scanw.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\scroll.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\scr_dump.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\slk.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\termattr.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\terminfo.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\touch.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\util.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\pdcurses\window.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdcclip.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdcdisp.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdcgetsc.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdckbd.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdcscrn.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdcsetsc.c" />
+    <ClCompile Condition="Exists('$(PDCURSES)')" Include="$(PDCURSES)\wincon\pdcutil.c" />
+  </ItemGroup>
+  <PropertyGroup >
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(PDCURSES);$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <DisableSpecificWarnings>4996;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
\ No newline at end of file
diff --git a/win/win32/vs2017/default_lib.props b/win/win32/vs2017/default_lib.props
new file mode 100644
index 000000000..61bf2ecaa
--- /dev/null
+++ b/win/win32/vs2017/default_lib.props
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" >
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" >
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+
+</Project>