Support VS2019 vc142/vc141_xp and build customization #385

Author: Anton-V-K

Notepad2e.vcxproj

@@ -67,9 +67,10 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' != '14.0'">v141_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
   </PropertyGroup>
+  <Import Project="User.props" Condition="exists('User.props')" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>

User.props.IN

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<!-- NOTE: You can copy this file to User.props to override some standard settings -->
+<!-- NOTE: Don't add the copy User.props to source control!!! -->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v142</PlatformToolset> <!-- VS2019 -->
+  </PropertyGroup>
+</Project>

scintilla/boostregex/BoostRegExSearch.cxx

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <iterator> 
 #include <memory>
+#include <stdexcept>
 #include <vector>
 #include "scintilla.h"
 #include "Platform.h"

scintilla/boostregex/UTF8DocumentIterator.h

@@ -2,6 +2,7 @@
 
 #include <iterator>
 #include <memory>
+#include <stdexcept>
 #include <vector>
 #include "Platform.h"
 #include "SplitVector.h"

scintilla/win32/PlatWin.cxx

@@ -18,6 +18,7 @@
 #include <map>
 #include <algorithm>
 #include <memory>
+#include <string>
 
 #pragma comment(lib, "Msimg32.lib")
 

test/Extension/Notepad2eTests.vcxproj

@@ -22,16 +22,16 @@
     <ProjectGuid>{A3852498-51BF-4A24-B720-F69D2E5E6403}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Notepad2eTests</RootNamespace>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141_xp</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' != '14.0'">v141_xp</PlatformToolset>
     <PlatformToolset Condition="'$(VisualStudioVersion)' == '14.0'">v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
+  <Import Project="..\..\User.props" Condition="exists('..\..\User.props')" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>