Upgrade to VS2017 and newer SDK.

diff --git a/win/win32/vs2017/.gitignore b/win/win32/vs2017/.gitignore
index 7c603881bcef2c81dd576ac12b583b7e16ccffb7..6d1d5c8676755d0201810c36718f73073a56900b 100644 (file)
--- a/win/win32/vs2017/.gitignore
+++ b/win/win32/vs2017/.gitignore
@@ -1 +1,4 @@
 !NetHack.sln
+*.db-shm
+*.db-wal
+

diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj
index e5207730e2230cd921d8e211ca94720096f34b5d..dfa15c39199a3d330d1c504342cbd52fd41f19c4 100644 (file)
--- a/win/win32/vs2017/NetHack.vcxproj
+++ b/win/win32/vs2017/NetHack.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}</ProjectGuid>
@@ -230,4 +230,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs2017/NetHackW.vcxproj
index b029173b1e0ada38d833f801cdfc87d5ed9a1cf0..d1cd0bb919bdabedafb4fadc5ab8723587b7382f 100644 (file)
--- a/win/win32/vs2017/NetHackW.vcxproj
+++ b/win/win32/vs2017/NetHackW.vcxproj
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CEC5D360-8804-454F-8591-002184C23499}</ProjectGuid>
     <RootNamespace>NetHackW</RootNamespace>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
   <PropertyGroup>
     <OutDir>$(BinDir)</OutDir>
   </PropertyGroup>
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
@@ -31,13 +27,10 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-       <!-- TODO common.props has SubSystem Console -->
       <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-
-
   <ItemGroup>
     <ClCompile Include="$(SrcDir)allmain.c" />
     <ClCompile Include="$(SrcDir)alloc.c" />
@@ -179,7 +172,7 @@
     <ResourceCompile Include="$(WinWin32Dir)winhack.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Target Name="AfterBuild">
+  <Target Name="AfterBuild">
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
   <Target Name="AfterClean">
@@ -188,5 +181,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-
- </Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/config.props b/win/win32/vs2017/config.props
index 81f2b263460def88f7b8a57367502dbd5ebb4616..9c40707ff098ca4c8d58a3befa78d2bff4e9fd4b 100644 (file)
--- a/win/win32/vs2017/config.props
+++ b/win/win32/vs2017/config.props
@@ -18,4 +18,7 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
 </Project>

diff --git a/win/win32/vs2017/default.props b/win/win32/vs2017/default.props
index 4c28a0661af0929e0a6ff476873331190e16d067..3ad8bdd109d610ac2e966e08b82d0e963552fb5e 100644 (file)
--- a/win/win32/vs2017/default.props
+++ b/win/win32/vs2017/default.props
@@ -4,7 +4,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" >
     <UseDebugLibraries>true</UseDebugLibraries>

diff --git a/win/win32/vs2017/dgncomp.vcxproj b/win/win32/vs2017/dgncomp.vcxproj
index 164941363b5e592e98cc91ddf285564c4fcf84a2..5ef5aec3ed3cae66b8a03f8d826ef71108bbb79b 100644 (file)
--- a/win/win32/vs2017/dgncomp.vcxproj
+++ b/win/win32/vs2017/dgncomp.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8A3F81C7-2968-49A8-86BF-2669412AD7DE}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -13,15 +11,12 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-
-
   <ItemGroup>
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SysShareDir)\dgn_lex.c" />
@@ -83,8 +78,8 @@
           $(BuildDependsOn);
         </BuildDependsOn>
       </PropertyGroup>
-       </When>
-       <Otherwise>
+    </When>
+    <Otherwise>
       <PropertyGroup>
         <BuildDependsOn>
           NoLex;
@@ -92,34 +87,34 @@
           $(BuildDependsOn);
         </BuildDependsOn>
       </PropertyGroup>
-       </Otherwise>
+    </Otherwise>
   </Choose>
   <Target Name="Yacc" Inputs="$(UtilDir)dgn_comp.y" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h">
     <Message Text="Running Yacc" Importance="high" />
     <Exec Command="$(YACC) -d dgn_comp.y" WorkingDirectory="$(UtilDir)" />
-       <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />  
+    <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />
   </Target>
   <Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)dgn_lex.c">
     <Message Text="Running Lex" Importance="high" />
     <Exec Command="$(LEX) dgn_comp.l" WorkingDirectory="$(UtilDir)" />
-       <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)dgn_lex.c" />        
+    <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)dgn_lex.c" />
   </Target>
   <Target Name="NoYacc" Inputs="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h">
     <Message Text="No Yacc using pre-built files" Importance="high" />
-       <Copy SourceFiles="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />    
+    <Copy SourceFiles="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />
   </Target>
   <Target Name="NoLex" Inputs="$(SysShareDir)dgn_lex.c" Outputs="$(UtilDir)dgn_lex.c">
     <Message Text="No Lex using pre-built files" Importance="high" />
-       <Copy SourceFiles="$(SysShareDir)dgn_lex.c" DestinationFiles="$(UtilDir)dgn_lex.c" />   
+    <Copy SourceFiles="$(SysShareDir)dgn_lex.c" DestinationFiles="$(UtilDir)dgn_lex.c" />
   </Target>
   <Target Name="AfterBuild">
     <MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
   <Target Name="AfterClean">
     <MSBuild Projects="afterdgncomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-       <Delete Files="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h;$(UtilDir)dgn_lex.c" />
+    <Delete Files="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h;$(UtilDir)dgn_lex.c" />
   </Target>
   <Target Name="AfterRebuild">
     <MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/dlb.vcxproj b/win/win32/vs2017/dlb.vcxproj
index 92ed86693e5915f56fba5b11f7fce83ad04a89f3..03b56b8818bf05d77dc3c9c810c2c5b145aa3ce6 100644 (file)
--- a/win/win32/vs2017/dlb.vcxproj
+++ b/win/win32/vs2017/dlb.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -13,14 +11,12 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <ItemGroup>
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SrcDir)dlb.c" />
@@ -40,4 +36,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afterdlb.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/levcomp.vcxproj b/win/win32/vs2017/levcomp.vcxproj
index 3c6839c822d8b2429ff054fca645ee03e0ddfc2b..3fbcffe5c3e476c0135de75d889642db815e9eaf 100644 (file)
--- a/win/win32/vs2017/levcomp.vcxproj
+++ b/win/win32/vs2017/levcomp.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -13,14 +11,12 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <ItemGroup>
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SrcDir)decl.c" />
@@ -30,9 +26,8 @@
     <ClCompile Include="$(UtilDir)lev_yacc.c" />
     <ClCompile Include="$(SrcDir)monst.c" />
     <ClCompile Include="$(SrcDir)objects.c" />
-    <ClCompile Include="$(UtilDir)panic.c" />  
+    <ClCompile Include="$(UtilDir)panic.c" />
   </ItemGroup>
-
   <ItemGroup>
     <ClInclude Include="$(IncDir)lev_comp.h" />
   </ItemGroup>
@@ -46,8 +41,8 @@
           $(BuildDependsOn);
         </BuildDependsOn>
       </PropertyGroup>
-       </When>
-       <Otherwise>
+    </When>
+    <Otherwise>
       <PropertyGroup>
         <BuildDependsOn>
           NoLex;
@@ -55,34 +50,34 @@
           $(BuildDependsOn);
         </BuildDependsOn>
       </PropertyGroup>
-       </Otherwise>
+    </Otherwise>
   </Choose>
   <Target Name="Yacc" Inputs="$(UtilDir)lev_comp.y" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h">
     <Message Text="Running Yacc" Importance="high" />
     <Exec Command="$(YACC) -d lev_comp.y" WorkingDirectory="$(UtilDir)" />
-       <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />  
+    <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />
   </Target>
   <Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)lev_lex.c">
     <Message Text="Running Lex" Importance="high" />
     <Exec Command="$(LEX) lev_comp.l" WorkingDirectory="$(UtilDir)" />
-       <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)lev_lex.c" />        
+    <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)lev_lex.c" />
   </Target>
   <Target Name="NoYacc" Inputs="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h">
     <Message Text="No Yacc using pre-built files" Importance="high" />
-       <Copy SourceFiles="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />    
+    <Copy SourceFiles="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />
   </Target>
   <Target Name="NoLex" Inputs="$(SysShareDir)lev_lex.c" Outputs="$(UtilDir)lev_lex.c">
     <Message Text="No Lex using pre-built files" Importance="high" />
-       <Copy SourceFiles="$(SysShareDir)lev_lex.c" DestinationFiles="$(UtilDir)lev_lex.c" />   
+    <Copy SourceFiles="$(SysShareDir)lev_lex.c" DestinationFiles="$(UtilDir)lev_lex.c" />
   </Target>
   <Target Name="AfterBuild">
     <MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
   <Target Name="AfterClean">
     <MSBuild Projects="afterlevcomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-       <Delete Files="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h;$(UtilDir)lev_lex.c" />
+    <Delete Files="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h;$(UtilDir)lev_lex.c" />
   </Target>
   <Target Name="AfterRebuild">
     <MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/makedefs.vcxproj b/win/win32/vs2017/makedefs.vcxproj
index c722676e275e6c227958feaed12ae01d1256d2ad..46cc21bd7a93f947ee79447fcf1751c3da34051b 100644 (file)
--- a/win/win32/vs2017/makedefs.vcxproj
+++ b/win/win32/vs2017/makedefs.vcxproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">       
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BA3DD34C-04B7-40D0-B373-9329AA9E8945}</ProjectGuid>
   </PropertyGroup>
@@ -12,16 +11,12 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-
-
   <ItemGroup>
     <ClCompile Include="..\..\..\util\makedefs.c" />
     <ClCompile Include="..\..\..\src\monst.c" />
@@ -52,4 +47,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/nh340key.vcxproj b/win/win32/vs2017/nh340key.vcxproj
index e7bc7fc7c205e6abe82395e4f7a1151bc318c2c3..945e6d110c632349f1cf8b674d25479fb733541a 100644 (file)
--- a/win/win32/vs2017/nh340key.vcxproj
+++ b/win/win32/vs2017/nh340key.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{be04e242-a1e9-4593-b95b-057f37330b76}</ProjectGuid>
@@ -39,4 +39,4 @@
     <ClInclude Include="$(SysWinntDir)win32api.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/nhdefkey.vcxproj b/win/win32/vs2017/nhdefkey.vcxproj
index f7d8ea4eda16824a1792f916ef1428d20152be61..37a36e01d14997e00a105f3e55f20ce982383b75 100644 (file)
--- a/win/win32/vs2017/nhdefkey.vcxproj
+++ b/win/win32/vs2017/nhdefkey.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6813477F-64B6-4B97-B230-438D0D233385}</ProjectGuid>
@@ -39,4 +39,4 @@
     <ClInclude Include="$(SysWinntDir)win32api.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/nhraykey.vcxproj b/win/win32/vs2017/nhraykey.vcxproj
index 891b0912fc2e8157a71f1ec1515c5def14485ad0..4936ae88bc21b4d49c9bdbc659899bb522d366d2 100644 (file)
--- a/win/win32/vs2017/nhraykey.vcxproj
+++ b/win/win32/vs2017/nhraykey.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2e1f4bb3-3bd7-43ad-8e64-d3b8a2f5d7b2}</ProjectGuid>
@@ -39,4 +39,4 @@
     <ClInclude Include="$(SysWinntDir)win32api.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/recover.vcxproj b/win/win32/vs2017/recover.vcxproj
index 51133a395416e685595ec9fb6b3a5ceb4c90ec3c..75fe4db9af936d6aa436fe3b0690bf3501579d30 100644 (file)
--- a/win/win32/vs2017/recover.vcxproj
+++ b/win/win32/vs2017/recover.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2F35F228-6733-4FE5-9B46-B3AA10D4BC2E}</ProjectGuid>
@@ -42,4 +42,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afterrecover.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/tile2bmp.vcxproj b/win/win32/vs2017/tile2bmp.vcxproj
index ea8e88a3837ffe13310d6f9dd1595f6cd98d0a9f..0c2db97c7ee8a26d5a0548163540940d8dbab6f3 100644 (file)
--- a/win/win32/vs2017/tile2bmp.vcxproj
+++ b/win/win32/vs2017/tile2bmp.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{642BC75D-ABAF-403E-8224-7C725FD4CB42}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -13,14 +11,12 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <ItemGroup>
     <ClCompile Include="$(SrcDir)decl.c" />
     <ClCompile Include="$(SrcDir)drawing.c" />
@@ -29,13 +25,11 @@
     <ClCompile Include="$(WinShareDir)tile2bmp.c" />
     <ClCompile Include="$(WinShareDir)tiletext.c" />
     <ClCompile Include="$(WinShareDir)tilemap.c">
-       <PreprocessorDefinitions>TILETEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       </ClCompile>
+      <PreprocessorDefinitions>TILETEXT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemGroup>
-
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-
- <Target Name="AfterBuild">
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="AfterBuild">
     <MSBuild Projects="aftertile2bmp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
   <Target Name="AfterClean">
@@ -44,4 +38,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="aftertile2bmp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/tilemap.vcxproj b/win/win32/vs2017/tilemap.vcxproj
index f340d8f1589bb3c63f8f8b325afb961a4de8bf90..d9edb8fa4028125fe9f833e9d7a102ffad9ec46b 100644 (file)
--- a/win/win32/vs2017/tilemap.vcxproj
+++ b/win/win32/vs2017/tilemap.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{93F10526-209E-41D7-BBEA-775787876895}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -13,14 +11,12 @@
   <Import Project="common.props" />
   <Import Project="dirs.props" />
   <Import Project="files.props" />
-
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-
   <ItemGroup>
     <ClCompile Include="$(WinShareDir)tilemap.c" />
   </ItemGroup>
@@ -78,4 +74,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="aftertilemap.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file

diff --git a/win/win32/vs2017/uudecode.vcxproj b/win/win32/vs2017/uudecode.vcxproj
index 466409cf493860d2f4fb9b89dc613944e6b1f8ad..bb03d7f7c97463dc4cfefca7ad5ba4560b9e928b 100644 (file)
--- a/win/win32/vs2017/uudecode.vcxproj
+++ b/win/win32/vs2017/uudecode.vcxproj
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="config.props" />
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{63F9B82B-F589-4082-ABE5-D4F0682050AB}</ProjectGuid>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -26,4 +24,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afteruudecode.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file