From d0dae4b36013a10b6972113cd5142826100bea2d Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Sun, 1 Apr 2018 19:51:34 +0300
Subject: [PATCH] FS-11086: [Build-System] Move libflite to pre-compiled
 libraries on Windows.

---
 Freeswitch.2015.sln                           |  36 +-
 libs/.gitignore                               |   2 +
 libs/win32/Download FLITE.2015.vcxproj        |  86 ---
 libs/win32/Download LIBSHOUT.2015.vcxproj     |   4 +-
 libs/win32/flite/flite.2010.vcxproj.filters   | 677 ------------------
 libs/win32/flite/flite.2015.vcxproj           | 355 ---------
 .../asr_tts/mod_flite/mod_flite.2015.vcxproj  | 134 +---
 w32/flite-version.props                       |  19 +
 w32/flite.props                               |  62 ++
 9 files changed, 90 insertions(+), 1285 deletions(-)
 delete mode 100644 libs/win32/Download FLITE.2015.vcxproj
 delete mode 100644 libs/win32/flite/flite.2010.vcxproj.filters
 delete mode 100644 libs/win32/flite/flite.2015.vcxproj
 create mode 100644 w32/flite-version.props
 create mode 100644 w32/flite.props

diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln
index b15ca7c65a..4ee012c46c 100644
--- a/Freeswitch.2015.sln
+++ b/Freeswitch.2015.sln
@@ -326,12 +326,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download 32khzsound", "libs
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "32khz", "libs\win32\Sound_Files\32khz.2015.vcxproj", "{464AAB78-5489-4916-BE51-BF8D61822311}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flite", "libs\win32\flite\flite.2015.vcxproj", "{0AD1177E-1FD8-4643-9391-431467A11084}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_flite", "src\mod\asr_tts\mod_flite\mod_flite.2015.vcxproj", "{66444AEE-554C-11DD-A9F0-8C5D56D89593}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download FLITE", "libs\win32\Download FLITE.2015.vcxproj", "{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LAME", "libs\win32\Download LAME.2015.vcxproj", "{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSHOUT", "libs\win32\Download LIBSHOUT.2015.vcxproj", "{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B}"
@@ -1469,20 +1465,10 @@ Global
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Debug|x64.ActiveCfg = Debug|x64
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|Win32.ActiveCfg = Release|Win32
 		{464AAB78-5489-4916-BE51-BF8D61822311}.Release|x64.ActiveCfg = Release|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.All|Win32.ActiveCfg = Release|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64.ActiveCfg = Release|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.All|x64.Build.0 = Release|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|Win32.Build.0 = Debug|Win32
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|x64.ActiveCfg = Debug|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Debug|x64.Build.0 = Debug|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|Win32.ActiveCfg = Release|Win32
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|Win32.Build.0 = Release|Win32
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|x64.ActiveCfg = Release|x64
-		{0AD1177E-1FD8-4643-9391-431467A11084}.Release|x64.Build.0 = Release|x64
-		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|Win32.ActiveCfg = Release Static|x64
-		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64.ActiveCfg = Release Static|x64
-		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64.Build.0 = Release Static|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|Win32.ActiveCfg = Release|Win32
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|Win32.Build.0 = Release|Win32
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64.ActiveCfg = Release|x64
+		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.All|x64.Build.0 = Release|x64
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|Win32.ActiveCfg = Debug|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|Win32.Build.0 = Debug|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Debug|x64.ActiveCfg = Debug|x64
@@ -1491,18 +1477,6 @@ Global
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|Win32.Build.0 = Release|Win32
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.ActiveCfg = Release|x64
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593}.Release|x64.Build.0 = Release|x64
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|Win32.ActiveCfg = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|Win32.Build.0 = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x64.ActiveCfg = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.All|x64.Build.0 = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|Win32.Build.0 = Debug|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|x64.ActiveCfg = Debug|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Debug|x64.Build.0 = Debug|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|Win32.ActiveCfg = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|Win32.Build.0 = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|x64.ActiveCfg = Release|Win32
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}.Release|x64.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|Win32.ActiveCfg = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|Win32.Build.0 = Release|Win32
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B}.All|x64.ActiveCfg = Release|Win32
@@ -3117,9 +3091,7 @@ Global
 		{7EB71250-F002-4ED8-92CA-CA218114537A} = {4F227C26-768F-46A3-8684-1D08A46FB374}
 		{6E49F6C2-ADDA-4BFB-81FE-AB9AF51B455F} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{464AAB78-5489-4916-BE51-BF8D61822311} = {4F227C26-768F-46A3-8684-1D08A46FB374}
-		{0AD1177E-1FD8-4643-9391-431467A11084} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
 		{66444AEE-554C-11DD-A9F0-8C5D56D89593} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
-		{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{D5D2BF72-29FE-4982-A9FA-82AB2086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{D5D2BF72-29FE-4982-A9FA-82AB3086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{D5D2BF72-29FE-4982-A9FA-82AB1086DB1B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
diff --git a/libs/.gitignore b/libs/.gitignore
index ad93a4dbe7..d2352fee04 100644
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -850,3 +850,5 @@ lua-*/
 lua-*
 curl-*/
 curl-*
+flite-*/
+flite-*
diff --git a/libs/win32/Download FLITE.2015.vcxproj b/libs/win32/Download FLITE.2015.vcxproj
deleted file mode 100644
index 2d088ba038..0000000000
--- a/libs/win32/Download FLITE.2015.vcxproj	
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Download FLITE</ProjectName>
-    <ProjectGuid>{D5D2BF72-29FE-4982-A9FA-82FDD086DB1B}</ProjectGuid>
-    <RootNamespace>Download FLITE</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(SolutionDir)\w32\extdll.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\FLITE\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\FLITE\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <BuildLog>
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
-    </BuildLog>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
-    </BuildLog>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="cleancount">
-      <FileType>Document</FileType>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Flite.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-2.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 "$(ProjectDir).."
-if exist "$(ProjectDir)..\flite-2.0.0-release" move "$(ProjectDir)..\flite-2.0.0-release" "$(ProjectDir)..\flite-2.0.0"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-2.0.0;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\flite-2.0.0" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-2.0.0-release.tar.bz2 "$(ProjectDir).."
-if exist "$(ProjectDir)..\flite-2.0.0-release" move "$(ProjectDir)..\flite-2.0.0-release" "$(ProjectDir)..\flite-2.0.0"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-2.0.0;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/Download LIBSHOUT.2015.vcxproj b/libs/win32/Download LIBSHOUT.2015.vcxproj
index b93ffef5f4..dd001adcc9 100644
--- a/libs/win32/Download LIBSHOUT.2015.vcxproj	
+++ b/libs/win32/Download LIBSHOUT.2015.vcxproj	
@@ -68,11 +68,11 @@
   <ItemGroup>
     <CustomBuild Include="cleancount">
       <FileType>Document</FileType>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Flite.</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading libshout.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\libshout-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz "$(ProjectDir).."
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\libshout-2.2.2;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading libshout.</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\libshout-2.2.2" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/libshout-2.2.2.tar.gz "$(ProjectDir).."
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\libshout-2.2.2;%(Outputs)</Outputs>
diff --git a/libs/win32/flite/flite.2010.vcxproj.filters b/libs/win32/flite/flite.2010.vcxproj.filters
deleted file mode 100644
index 566f7a7158..0000000000
--- a/libs/win32/flite/flite.2010.vcxproj.filters
+++ /dev/null
@@ -1,677 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="voices">
-      <UniqueIdentifier>{8a9db04d-0a7b-47f2-97ed-73acecd51688}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="voices\kal">
-      <UniqueIdentifier>{f4b8438d-32d6-4e75-926b-b3950baf2282}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="voices\awb">
-      <UniqueIdentifier>{58f041f5-13f9-4986-aa26-ab41db21c3b1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="voices\rms">
-      <UniqueIdentifier>{f4db3d58-e9d3-415a-ae41-cc3dd1012fc2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="voices\slt">
-      <UniqueIdentifier>{2e2fca2e-fc24-48cd-bfa0-42ceb5aa5331}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="voices\kal16">
-      <UniqueIdentifier>{29f922d5-330d-49c3-9f8d-5aaada042fe0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_streaming.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\audio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_command.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_none.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_rules.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_postlex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_data.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_entries.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_mmap_win32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_string.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_tokenstream.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_const.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_user.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_wchar.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_args.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_endian.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_error.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_features.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lpc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_mcep.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_clunits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lex_entry.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_voice.cpp">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sigpr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sts.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_units.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_clunits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_diphone.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_reflpc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_utt_utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_voice.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\flite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ffeatures.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_phoneset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ssml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_synth.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_viterbi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_ss.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_utils.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g72x.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g721.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_24.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_40.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\rateconv.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_lpcres.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track_io.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_io.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\regex\regexp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\regex\regsub.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\regex\cst_regex.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlpg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlsa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_vc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_gpos.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phoneset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_text.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\usenglish.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_aswd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_dur_stats.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_expand.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0_model.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0lr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_file_stdio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_relation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_utterance.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_ffeature.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_item.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_rel_io.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts_rewrites.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lexicon.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c">
-      <Filter>voices\awb</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c">
-      <Filter>voices\rms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c">
-      <Filter>voices\slt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_ressize.c">
-      <Filter>voices\kal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal.c">
-      <Filter>voices\kal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_diphone.c">
-      <Filter>voices\kal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_res.c">
-      <Filter>voices\kal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_lpc.c">
-      <Filter>voices\kal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_residx.c">
-      <Filter>voices\kal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16.c">
-      <Filter>voices\kal16</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_diphone.c">
-      <Filter>voices\kal16</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_lpc.c">
-      <Filter>voices\kal16</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_res.c">
-      <Filter>voices\kal16</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_residx.c">
-      <Filter>voices\kal16</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_spamf0.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_load_voice.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_dump_voice.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_map.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_url.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_socket.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_time_awb\voxdefs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h">
-      <Filter>voices\slt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\voxdefs.h">
-      <Filter>voices\slt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h">
-      <Filter>voices\slt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h">
-      <Filter>voices\slt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\stdafx.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\voxdefs.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\src\speech\g72x.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\src\regex\cst_regex_defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_regexes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_text.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\usenglish.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_f0.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h">
-      <Filter>voices\awb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\voxdefs.h">
-      <Filter>voices\awb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h">
-      <Filter>voices\awb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_const.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_defs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_viterbi.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_voice.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_wave.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\flite.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_alloc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_args.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_audio.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_cart.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_cg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_clunits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_diphone.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_endian.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_error.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_features.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_ffeatures.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_file.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_hrg.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_item.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_lexicon.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts_rewrites.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_math.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_phoneset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_regex.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_relation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_sigpr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_ss.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_string.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_sts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_synth.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_tokenstream.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_track.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_units.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_utt_utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_utterance.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_val.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h">
-      <Filter>voices\awb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h">
-      <Filter>voices\awb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h">
-      <Filter>voices\awb</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h">
-      <Filter>voices\rms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h">
-      <Filter>voices\slt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h">
-      <Filter>voices\slt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal\voxdefs.h">
-      <Filter>voices\kal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal16\voxdefs.h">
-      <Filter>voices\kal16</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_cg_map.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_spamf0.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/win32/flite/flite.2015.vcxproj b/libs/win32/flite/flite.2015.vcxproj
deleted file mode 100644
index ac34940ff4..0000000000
--- a/libs/win32/flite/flite.2015.vcxproj
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>flite</ProjectName>
-    <ProjectGuid>{0AD1177E-1FD8-4643-9391-431467A11084}</ProjectGuid>
-    <RootNamespace>flite-2.0.0</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\w32\extlib.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4459;4305;4090;4018;4701;4054;4055;4133;4127;4702;4996;4244;4100;4057;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4459;4305;4090;4018;4701;4054;4055;4133;4127;4702;4996;4244;4100;4057;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4459;4305;4090;4018;4701;4054;4055;4133;4127;4702;4996;4244;4100;4057;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\flite-2.0.0\include;..\..\flite-2.0.0\lang\usenglish;..\..\flite-2.0.0\lang\cmulex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CST_AUDIO_NONE=1;NO_UNION_INITIALIZATION=1;_CRT_SECURE_NO_WARNINGS;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4459;4305;4090;4018;4701;4054;4055;4133;4127;4702;4996;4244;4100;4057;4706;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_data.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex_entries.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_rules.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmulex\cmu_postlex.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_clunits.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lex_entry.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_lpc.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_time_awb\cmu_time_awb_mcep.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_phonestate.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_params.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent_params.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_diphone.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_lpc.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_res.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal16\cmu_us_kal16_residx.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_diphone.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_lpc.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_res.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_residx.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_kal\cmu_us_kal_ressize.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_phonestate.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_params.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent_params.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_voice.cpp" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_phonestate.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_params.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent_params.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\usenglish.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_aswd.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_dur_stats.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_expand.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0lr.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_f0_model.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_gpos.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phoneset.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\lang\usenglish\us_text.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\audio.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_command.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_none.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\audio\au_streaming.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_dump_voice.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_load_voice.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_cg_map.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlpg.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_mlsa.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_spamf0.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\cg\cst_vc.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_ffeature.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_item.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_relation.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_rel_io.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\hrg\cst_utterance.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lexicon.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\lexicon\cst_lts_rewrites.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\regex\cst_regex.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\regex\regexp.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\regex\regsub.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_lpcres.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_track_io.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_io.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\cst_wave_utils.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g721.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_24.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g723_40.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\g72x.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\speech\rateconv.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_cart.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_ss.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\stats\cst_viterbi.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ffeatures.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_phoneset.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_ssml.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_synth.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_utt_utils.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\cst_voice.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\synth\flite.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_alloc.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_args.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_endian.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_error.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_features.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_file_stdio.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_mmap_win32.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_socket.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_string.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_tokenstream.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_url.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_const.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_val_user.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\utils\cst_wchar.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_clunits.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_diphone.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_reflpc.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sigpr.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_sts.c" />
-    <ClCompile Include="..\..\flite-2.0.0\src\wavesynth\cst_units.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_alloc.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_args.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_audio.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_cg.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_clunits.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_diphone.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_endian.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_error.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_features.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_ffeatures.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_file.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_hrg.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_item.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_lexicon.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_lts_rewrites.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_math.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_phoneset.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_regex.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_relation.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_sigpr.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_socket.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_ss.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_string.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_sts.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_synth.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_tokenstream.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_track.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_units.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_utterance.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_utt_utils.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_val.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_const.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_val_defs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_viterbi.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_voice.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_wave.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\cst_wchar.h" />
-    <ClInclude Include="..\..\flite-2.0.0\include\flite.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lex.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmulex\cmu_lts_model.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_time_awb\voxdefs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_durmodel.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_f0_trees.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_cg_single_mcep_trees.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_accent.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\cmu_us_awb_spamf0_phrase.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_awb\voxdefs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal16\voxdefs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_kal\voxdefs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_durmodel.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_f0_trees.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_cg_single_mcep_trees.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_accent.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\cmu_us_rms_spamf0_phrase.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\stdafx.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_rms\voxdefs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_durmodel.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_f0_trees.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_cg_single_mcep_trees.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_accent.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\cmu_us_slt_spamf0_phrase.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\cmu_us_slt\voxdefs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\usenglish.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_durz_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_f0.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_ffeatures.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_accent_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_int_tone_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_nums_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_phrasing_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_pos_cart.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_regexes.h" />
-    <ClInclude Include="..\..\flite-2.0.0\lang\usenglish\us_text.h" />
-    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_cg_map.h" />
-    <ClInclude Include="..\..\flite-2.0.0\src\cg\cst_spamf0.h" />
-    <ClInclude Include="..\..\flite-2.0.0\src\regex\cst_regex_defs.h" />
-    <ClInclude Include="..\..\flite-2.0.0\src\speech\g72x.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Download FLITE.2015.vcxproj">
-      <Project>{d5d2bf72-29fe-4982-a9fa-82fdd086db1b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/mod/asr_tts/mod_flite/mod_flite.2015.vcxproj b/src/mod/asr_tts/mod_flite/mod_flite.2015.vcxproj
index 4d3c6bd29e..050ac33b8e 100644
--- a/src/mod/asr_tts/mod_flite/mod_flite.2015.vcxproj
+++ b/src/mod/asr_tts/mod_flite/mod_flite.2015.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug Static|Win32">
-      <Configuration>Debug Static</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug Static|x64">
-      <Configuration>Debug Static</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
@@ -17,14 +9,6 @@
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static|Win32">
-      <Configuration>Release Static</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release Static|x64">
-      <Configuration>Release Static</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -41,16 +25,6 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -61,16 +35,6 @@
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
@@ -82,16 +46,9 @@
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="..\..\..\..\w32\flite.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_release.props" />
@@ -100,14 +57,6 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_debug.props" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_release.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\w32\module_debug.props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="..\..\..\..\w32\module_release.props" />
@@ -121,20 +70,14 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -145,13 +88,11 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -160,14 +101,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -178,78 +116,11 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../../libs/flite-2.0.0/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -260,9 +131,6 @@
     <ClCompile Include="mod_flite.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\libs\win32\flite\flite.2015.vcxproj">
-      <Project>{0ad1177e-1fd8-4643-9391-431467a11084}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2015.vcxproj">
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/w32/flite-version.props b/w32/flite-version.props
new file mode 100644
index 0000000000..070234881d
--- /dev/null
+++ b/w32/flite-version.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <fliteVersion>2.0.0</fliteVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <fliteVersionImported>true</fliteVersionImported>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="fliteVersion">
+      <Value>$(fliteVersion)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/w32/flite.props b/w32/flite.props
new file mode 100644
index 0000000000..f1ce2b9ff0
--- /dev/null
+++ b/w32/flite.props
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="flite-version.props" Condition=" '$(fliteVersionImported)' == '' "/>
+    <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
+  </ImportGroup>
+
+  <PropertyGroup Label="UserMacros">
+    <fliteLibDir>$(BaseDir)libs\flite-$(fliteVersion)</fliteLibDir>
+  </PropertyGroup>
+
+  <!-- 
+       Download Target.
+       Name must be unique. 
+       By design, targets are executed only once per project.
+       
+       Usage:
+       
+       package: URI
+
+       expectfileordirectory: Skips the download and extraction if exists
+
+       outputfolder: Folder to store a downloaded file. 
+                     By default "$(BaseDir)libs", if empty
+
+       outputfilename: If not empty, overrides filename from URI.
+                       .exe files don't get extracted
+
+       extractto: Folder to extract an archive to
+   -->
+
+  <Target Name="flite-binariesTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
+      <DownloadPackageTask 
+           package="http://files.freeswitch.org/windows/packages/flite/$(fliteVersion)/flite-$(fliteVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           expectfileordirectory="$(fliteLibDir)\binaries\$(Platform.ToLower())\$(Configuration.ToLower())\flite.lib" 
+           outputfolder=""
+           outputfilename="" 
+           extractto="$(BaseDir)libs"
+      />
+  </Target> 
+
+  <Target Name="flite-headersTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
+      <DownloadPackageTask 
+           package="http://files.freeswitch.org/windows/packages/flite/$(fliteVersion)/flite-$(fliteVersion)-headers.zip"
+           expectfileordirectory="$(fliteLibDir)\include\flite.h" 
+           outputfolder=""
+           outputfilename="" 
+           extractto="$(BaseDir)libs"
+      />
+  </Target> 
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(fliteLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(fliteLibDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>flite.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+
+</Project>