From b16ff0119ef7dca0238d20f80b4c0c15784c00e0 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Sun, 4 Jun 2017 18:11:59 +0100
Subject: [PATCH] windows: update the project files to Visual Studio 2017

---
 README.md                                |  10 +-
 src/windows/data.vcxproj                 | 170 +++++++++++------------
 src/windows/espeak-ng.vcxproj            |  10 +-
 src/windows/libespeak-ng.vcxproj         |  12 +-
 src/windows/libespeak-ng.vcxproj.filters |  35 ++++-
 5 files changed, 139 insertions(+), 98 deletions(-)

diff --git a/README.md b/README.md
index 341e2660..79dd7896 100644
--- a/README.md
+++ b/README.md
@@ -80,10 +80,18 @@ the `src/windows` directory:
 
 	msbuild espeak-ng.sln
 
-If building with Visual Studio 2003, you need to use:
+To build with a specific version of Visual Studio, you need to use:
 
 	msbuild /p:PlatformToolset=v120 espeak-ng.sln
 
+replacing `v120` with the appropriate value for the target Visual Studio version:
+
+| PlatformToolset | Visual Studio |
+|-----------------|---------------|
+| v120            | 2013          |
+| v140            | 2015          |
+| v141 (default)  | 2017          |
+
 ## Linux, Mac, BSD
 
 ### Dependencies
diff --git a/src/windows/data.vcxproj b/src/windows/data.vcxproj
index 99126967..4f976243 100644
--- a/src/windows/data.vcxproj
+++ b/src/windows/data.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">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -36,12 +36,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -80,244 +80,244 @@
   </Target>
   <Target Name="Build" DependsOnTargets="Intonations;Phonemes;Dictionaries" />
   <Target Name="af" Inputs="$(ProjectDir)..\..\dictsource\af_rules;$(ProjectDir)..\..\dictsource\af_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\af_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=af"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=af" />
   </Target>
   <Target Name="am" Inputs="$(ProjectDir)..\..\dictsource\am_rules;$(ProjectDir)..\..\dictsource\am_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\am_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=am"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=am" />
   </Target>
   <Target Name="an" Inputs="$(ProjectDir)..\..\dictsource\an_rules;$(ProjectDir)..\..\dictsource\an_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\an_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=an"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=an" />
   </Target>
   <Target Name="ar" Inputs="$(ProjectDir)..\..\dictsource\ar_rules;$(ProjectDir)..\..\dictsource\ar_list;$(ProjectDir)..\..\dictsource\ar_listx" Outputs="$(ProjectDir)..\..\espeak-ng-data\ar_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ar"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ar" />
   </Target>
   <Target Name="as" Inputs="$(ProjectDir)..\..\dictsource\as_rules;$(ProjectDir)..\..\dictsource\as_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\as_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=as"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=as" />
   </Target>
   <Target Name="az" Inputs="$(ProjectDir)..\..\dictsource\az_rules;$(ProjectDir)..\..\dictsource\az_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\az_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=az"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=az" />
   </Target>
   <Target Name="bg" Inputs="$(ProjectDir)..\..\dictsource\bg_rules;$(ProjectDir)..\..\dictsource\bg_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\bg_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=bg"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=bg" />
   </Target>
   <Target Name="bn" Inputs="$(ProjectDir)..\..\dictsource\bn_rules;$(ProjectDir)..\..\dictsource\bn_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\bn_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=bn"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=bn" />
   </Target>
   <Target Name="ca" Inputs="$(ProjectDir)..\..\dictsource\ca_rules;$(ProjectDir)..\..\dictsource\ca_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ca_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ca"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ca" />
   </Target>
   <Target Name="cs" Inputs="$(ProjectDir)..\..\dictsource\cs_rules;$(ProjectDir)..\..\dictsource\cs_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\cs_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=cs"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=cs" />
   </Target>
   <Target Name="cy" Inputs="$(ProjectDir)..\..\dictsource\cy_rules;$(ProjectDir)..\..\dictsource\cy_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\cy_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=cy"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=cy" />
   </Target>
   <Target Name="da" Inputs="$(ProjectDir)..\..\dictsource\da_rules;$(ProjectDir)..\..\dictsource\da_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\da_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=da"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=da" />
   </Target>
   <Target Name="de" Inputs="$(ProjectDir)..\..\dictsource\de_rules;$(ProjectDir)..\..\dictsource\de_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\de_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=de"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=de" />
   </Target>
   <Target Name="el" Inputs="$(ProjectDir)..\..\dictsource\el_rules;$(ProjectDir)..\..\dictsource\el_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\el_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=el"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=el" />
   </Target>
   <Target Name="en" Inputs="$(ProjectDir)..\..\dictsource\en_rules;$(ProjectDir)..\..\dictsource\en_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\en_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=en"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=en" />
   </Target>
   <Target Name="eo" Inputs="$(ProjectDir)..\..\dictsource\eo_rules;$(ProjectDir)..\..\dictsource\eo_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\eo_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=eo"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=eo" />
   </Target>
   <Target Name="es" Inputs="$(ProjectDir)..\..\dictsource\es_rules;$(ProjectDir)..\..\dictsource\es_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\es_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=es"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=es" />
   </Target>
   <Target Name="et" Inputs="$(ProjectDir)..\..\dictsource\et_rules;$(ProjectDir)..\..\dictsource\et_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\et_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=et"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=et" />
   </Target>
   <Target Name="eu" Inputs="$(ProjectDir)..\..\dictsource\eu_rules;$(ProjectDir)..\..\dictsource\eu_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\eu_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=eu"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=eu" />
   </Target>
   <Target Name="fa" Inputs="$(ProjectDir)..\..\dictsource\fa_rules;$(ProjectDir)..\..\dictsource\fa_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\fa_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=fa"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=fa" />
   </Target>
   <Target Name="fi" Inputs="$(ProjectDir)..\..\dictsource\fi_rules;$(ProjectDir)..\..\dictsource\fi_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\fi_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=fi"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=fi" />
   </Target>
   <Target Name="fr" Inputs="$(ProjectDir)..\..\dictsource\fr_rules;$(ProjectDir)..\..\dictsource\fr_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\fr_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=fr"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=fr" />
   </Target>
   <Target Name="ga" Inputs="$(ProjectDir)..\..\dictsource\ga_rules;$(ProjectDir)..\..\dictsource\ga_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ga_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ga"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ga" />
   </Target>
   <Target Name="gd" Inputs="$(ProjectDir)..\..\dictsource\gd_rules;$(ProjectDir)..\..\dictsource\gd_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\gd_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gd"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gd" />
   </Target>
   <Target Name="gn" Inputs="$(ProjectDir)..\..\dictsource\gn_rules;$(ProjectDir)..\..\dictsource\gn_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\gn_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gn"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gn" />
   </Target>
   <Target Name="grc" Inputs="$(ProjectDir)..\..\dictsource\grc_rules;$(ProjectDir)..\..\dictsource\grc_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\grc_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=grc"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=grc" />
   </Target>
   <Target Name="gu" Inputs="$(ProjectDir)..\..\dictsource\gu_rules;$(ProjectDir)..\..\dictsource\gu_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\gu_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gu"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gu" />
   </Target>
   <Target Name="hbs" Inputs="$(ProjectDir)..\..\dictsource\hbs_rules;$(ProjectDir)..\..\dictsource\hbs_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\hbs_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hbs"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hbs" />
   </Target>
   <Target Name="hi" Inputs="$(ProjectDir)..\..\dictsource\hi_rules;$(ProjectDir)..\..\dictsource\hi_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\hi_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hi"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hi" />
   </Target>
   <Target Name="hu" Inputs="$(ProjectDir)..\..\dictsource\hu_rules;$(ProjectDir)..\..\dictsource\hu_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\hu_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hu"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hu" />
   </Target>
   <Target Name="hy" Inputs="$(ProjectDir)..\..\dictsource\hy_rules;$(ProjectDir)..\..\dictsource\hy_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\hy_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hy"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=hy" />
   </Target>
   <Target Name="ia" Inputs="$(ProjectDir)..\..\dictsource\ia_rules;$(ProjectDir)..\..\dictsource\ia_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ia_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ia"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ia" />
   </Target>
   <Target Name="id" Inputs="$(ProjectDir)..\..\dictsource\id_rules;$(ProjectDir)..\..\dictsource\id_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\id_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=id"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=id" />
   </Target>
   <Target Name="is" Inputs="$(ProjectDir)..\..\dictsource\is_rules;$(ProjectDir)..\..\dictsource\is_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\is_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=is"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=is" />
   </Target>
   <Target Name="it" Inputs="$(ProjectDir)..\..\dictsource\it_rules;$(ProjectDir)..\..\dictsource\it_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\it_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=it"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=it" />
   </Target>
   <Target Name="jbo" Inputs="$(ProjectDir)..\..\dictsource\jbo_rules;$(ProjectDir)..\..\dictsource\jbo_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\jbo_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=jbo"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=jbo" />
   </Target>
   <Target Name="jp" Inputs="$(ProjectDir)..\..\dictsource\jp_rules;$(ProjectDir)..\..\dictsource\jp_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\jp_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=jp"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=jp" />
   </Target>
   <Target Name="ka" Inputs="$(ProjectDir)..\..\dictsource\ka_rules;$(ProjectDir)..\..\dictsource\ka_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ka_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ka"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ka" />
   </Target>
   <Target Name="kl" Inputs="$(ProjectDir)..\..\dictsource\kl_rules;$(ProjectDir)..\..\dictsource\kl_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\kl_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=kl"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=kl" />
   </Target>
   <Target Name="kn" Inputs="$(ProjectDir)..\..\dictsource\kn_rules;$(ProjectDir)..\..\dictsource\kn_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\kn_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=kn"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=kn" />
   </Target>
   <Target Name="ko" Inputs="$(ProjectDir)..\..\dictsource\ko_rules;$(ProjectDir)..\..\dictsource\ko_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ko_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ko"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ko" />
   </Target>
   <Target Name="ku" Inputs="$(ProjectDir)..\..\dictsource\ku_rules;$(ProjectDir)..\..\dictsource\ku_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ku_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ku"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ku" />
   </Target>
   <Target Name="ky" Inputs="$(ProjectDir)..\..\dictsource\ky_rules;$(ProjectDir)..\..\dictsource\ky_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ky_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ky"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ky" />
   </Target>
   <Target Name="la" Inputs="$(ProjectDir)..\..\dictsource\la_rules;$(ProjectDir)..\..\dictsource\la_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\la_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=la"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=la" />
   </Target>
   <Target Name="lfn" Inputs="$(ProjectDir)..\..\dictsource\lfn_rules;$(ProjectDir)..\..\dictsource\lfn_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\lfn_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=lfn"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=lfn" />
   </Target>
   <Target Name="lt" Inputs="$(ProjectDir)..\..\dictsource\lt_rules;$(ProjectDir)..\..\dictsource\lt_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\lt_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=lt"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=lt" />
   </Target>
   <Target Name="lv" Inputs="$(ProjectDir)..\..\dictsource\lv_rules;$(ProjectDir)..\..\dictsource\lv_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\lv_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=lv"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=lv" />
   </Target>
   <Target Name="mk" Inputs="$(ProjectDir)..\..\dictsource\mk_rules;$(ProjectDir)..\..\dictsource\mk_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\mk_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=mk"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=mk" />
   </Target>
   <Target Name="ml" Inputs="$(ProjectDir)..\..\dictsource\ml_rules;$(ProjectDir)..\..\dictsource\ml_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ml_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ml"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ml" />
   </Target>
   <Target Name="mr" Inputs="$(ProjectDir)..\..\dictsource\mr_rules;$(ProjectDir)..\..\dictsource\mr_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\mr_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=mr"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=mr" />
   </Target>
   <Target Name="ms" Inputs="$(ProjectDir)..\..\dictsource\ms_rules;$(ProjectDir)..\..\dictsource\ms_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ms_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ms"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ms" />
   </Target>
   <Target Name="mt" Inputs="$(ProjectDir)..\..\dictsource\mt_rules;$(ProjectDir)..\..\dictsource\mt_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\mt_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=mt"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=mt" />
   </Target>
   <Target Name="my" Inputs="$(ProjectDir)..\..\dictsource\my_rules;$(ProjectDir)..\..\dictsource\my_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\my_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=my"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=my" />
   </Target>
   <Target Name="nci" Inputs="$(ProjectDir)..\..\dictsource\nci_rules;$(ProjectDir)..\..\dictsource\nci_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\nci_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=nci"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=nci" />
   </Target>
   <Target Name="ne" Inputs="$(ProjectDir)..\..\dictsource\ne_rules;$(ProjectDir)..\..\dictsource\ne_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ne_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ne"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ne" />
   </Target>
   <Target Name="nl" Inputs="$(ProjectDir)..\..\dictsource\nl_rules;$(ProjectDir)..\..\dictsource\nl_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\nl_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=nl"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=nl" />
   </Target>
   <Target Name="no" Inputs="$(ProjectDir)..\..\dictsource\no_rules;$(ProjectDir)..\..\dictsource\no_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\no_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=no"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=no" />
   </Target>
   <Target Name="om" Inputs="$(ProjectDir)..\..\dictsource\om_rules;$(ProjectDir)..\..\dictsource\om_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\om_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=om"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=om" />
   </Target>
   <Target Name="or" Inputs="$(ProjectDir)..\..\dictsource\or_rules;$(ProjectDir)..\..\dictsource\or_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\or_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=or"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=or" />
   </Target>
   <Target Name="pa" Inputs="$(ProjectDir)..\..\dictsource\pa_rules;$(ProjectDir)..\..\dictsource\pa_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\pa_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pa"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pa" />
   </Target>
   <Target Name="pap" Inputs="$(ProjectDir)..\..\dictsource\pap_rules;$(ProjectDir)..\..\dictsource\pap_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\pap_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pap"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pap" />
   </Target>
   <Target Name="pl" Inputs="$(ProjectDir)..\..\dictsource\pl_rules;$(ProjectDir)..\..\dictsource\pl_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\pl_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pl"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pl" />
   </Target>
   <Target Name="pt" Inputs="$(ProjectDir)..\..\dictsource\pt_rules;$(ProjectDir)..\..\dictsource\pt_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\pt_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pt"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=pt" />
   </Target>
   <Target Name="ro" Inputs="$(ProjectDir)..\..\dictsource\ro_rules;$(ProjectDir)..\..\dictsource\ro_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ro_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ro"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ro" />
   </Target>
   <Target Name="ru" Inputs="$(ProjectDir)..\..\dictsource\ru_rules;$(ProjectDir)..\..\dictsource\ru_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ru_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ru"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ru" />
   </Target>
   <Target Name="si" Inputs="$(ProjectDir)..\..\dictsource\si_rules;$(ProjectDir)..\..\dictsource\si_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\si_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=si"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=si" />
   </Target>
   <Target Name="sk" Inputs="$(ProjectDir)..\..\dictsource\sk_rules;$(ProjectDir)..\..\dictsource\sk_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\sk_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sk"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sk" />
   </Target>
   <Target Name="sl" Inputs="$(ProjectDir)..\..\dictsource\sl_rules;$(ProjectDir)..\..\dictsource\sl_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\sl_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sl"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sl" />
   </Target>
   <Target Name="sq" Inputs="$(ProjectDir)..\..\dictsource\sq_rules;$(ProjectDir)..\..\dictsource\sq_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\sq_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sq"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sq" />
   </Target>
   <Target Name="sv" Inputs="$(ProjectDir)..\..\dictsource\sv_rules;$(ProjectDir)..\..\dictsource\sv_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\sv_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sv"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sv" />
   </Target>
   <Target Name="sw" Inputs="$(ProjectDir)..\..\dictsource\sw_rules;$(ProjectDir)..\..\dictsource\sw_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\sw_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sw"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=sw" />
   </Target>
   <Target Name="ta" Inputs="$(ProjectDir)..\..\dictsource\ta_rules;$(ProjectDir)..\..\dictsource\ta_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ta_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ta"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ta" />
   </Target>
   <Target Name="te" Inputs="$(ProjectDir)..\..\dictsource\te_rules;$(ProjectDir)..\..\dictsource\te_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\te_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=te"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=te" />
   </Target>
   <Target Name="tn" Inputs="$(ProjectDir)..\..\dictsource\tn_rules;$(ProjectDir)..\..\dictsource\tn_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\tn_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=tn"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=tn" />
   </Target>
   <Target Name="tr" Inputs="$(ProjectDir)..\..\dictsource\tr_rules;$(ProjectDir)..\..\dictsource\tr_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\tr_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=tr"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=tr" />
   </Target>
   <Target Name="tt" Inputs="$(ProjectDir)..\..\dictsource\tt_rules;$(ProjectDir)..\..\dictsource\tt_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\tt_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=tt"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=tt" />
   </Target>
   <Target Name="ur" Inputs="$(ProjectDir)..\..\dictsource\ur_rules;$(ProjectDir)..\..\dictsource\ur_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ur_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ur"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ur" />
   </Target>
   <Target Name="vi" Inputs="$(ProjectDir)..\..\dictsource\vi_rules;$(ProjectDir)..\..\dictsource\vi_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\vi_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=vi"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=vi" />
   </Target>
   <Target Name="zh" Inputs="$(ProjectDir)..\..\dictsource\zh_rules;$(ProjectDir)..\..\dictsource\zh_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\zh_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zh"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zh" />
   </Target>
   <Target Name="zhy" Inputs="$(ProjectDir)..\..\dictsource\zhy_rules" Outputs="$(ProjectDir)..\..\espeak-ng-data\zhy_dict" DependsOnTargets="Phonemes">
-    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zhy"/>
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zhy" />
   </Target>
-  <Target Name="Dictionaries" DependsOnTargets="af;am;an;as;az;bg;bn;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;gn;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;jp;ka;kl;kn;ko;ku;ky;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy"/>
-</Project>
+  <Target Name="Dictionaries" DependsOnTargets="af;am;an;as;az;bg;bn;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;gn;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;jp;ka;kl;kn;ko;ku;ky;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy" />
+</Project>
\ No newline at end of file
diff --git a/src/windows/espeak-ng.vcxproj b/src/windows/espeak-ng.vcxproj
index 395864df..1fafd931 100644
--- a/src/windows/espeak-ng.vcxproj
+++ b/src/windows/espeak-ng.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">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,26 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/src/windows/libespeak-ng.vcxproj b/src/windows/libespeak-ng.vcxproj
index 83ccf944..0325e7b3 100644
--- a/src/windows/libespeak-ng.vcxproj
+++ b/src/windows/libespeak-ng.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">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -28,26 +28,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -221,4 +221,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/windows/libespeak-ng.vcxproj.filters b/src/windows/libespeak-ng.vcxproj.filters
index 38364fb0..fd91ed15 100644
--- a/src/windows/libespeak-ng.vcxproj.filters
+++ b/src/windows/libespeak-ng.vcxproj.filters
@@ -108,6 +108,36 @@
     <ClCompile Include="..\pcaudiolib\src\xaudio2.cpp">
       <Filter>pcaudiolib</Filter>
     </ClCompile>
+    <ClCompile Include="..\ucd-tools\src\case.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ucd-tools\src\categories.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ucd-tools\src\ctype.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ucd-tools\src\proplist.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ucd-tools\src\scripts.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ucd-tools\src\tostring.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libespeak-ng\encoding.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libespeak-ng\mnemonics.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libespeak-ng\phoneme.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libespeak-ng\tokenizer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="config.h">
@@ -155,10 +185,13 @@
     <ClInclude Include="..\pcaudiolib\src\include\pcaudiolib\audio.h">
       <Filter>pcaudiolib</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\ucd-tools\src\include\ucd\ucd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libespeak-ng.def">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file