From 5f2f19a646696a2b95eac23d8b6dbbed998a9c8e Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Thu, 21 Nov 2019 19:39:19 +0100
Subject: [PATCH] dmake: Update Visual Studio solution and project (#2385)

This also fixes syntax errors for modern code that is not supported
by old Visual Studio IDEs/compilers.
---
 tools/dmake.sln     | 7 ++++++-
 tools/dmake.vcxproj | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/dmake.sln b/tools/dmake.sln
index 0b79849fc..e3a1f1e9d 100644
--- a/tools/dmake.sln
+++ b/tools/dmake.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29519.87
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dmake", "dmake.vcxproj", "{19EC86CD-0004-4917-B852-E6BD110B6E6F}"
 EndProject
 Global
@@ -17,4 +19,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3C0A1D1C-BDE8-453D-9FB3-EC4DEB9BC733}
+	EndGlobalSection
 EndGlobal
diff --git a/tools/dmake.vcxproj b/tools/dmake.vcxproj
index 5e781cf2c..1ce112abf 100644
--- a/tools/dmake.vcxproj
+++ b/tools/dmake.vcxproj
@@ -14,17 +14,18 @@
     <ProjectGuid>{19EC86CD-0004-4917-B852-E6BD110B6E6F}</ProjectGuid>
     <RootNamespace>dmake</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -77,7 +78,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\lib;..\externals\simplecpp;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>