From 31e7333e2afdc03ad4d7d231ef8a39456ddf7ceb Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Thu, 17 Sep 2026 16:45:36 +0300
Subject: [PATCH] [Build-System] Get sphinxbase, pocketsphinx and the
 communicator model from freeswitch/windows-deps releases instead of
 files.freeswitch.org, upgrade Windows build to sphinxbase/pocketsphinx v0.8
 (#3176)

---
 debian/util.sh                                |   6 +-
 freeswitch.spec                               |   6 +-
 .../pocketsphinx/pocketsphinx.2017.vcxproj    | 122 ++++----
 libs/win32/sphinxbase/sphinxbase.2017.vcxproj | 267 ++++++++++--------
 scripts/freeswitch.pkg_deps.sh                |   2 +-
 .../mod_pocketsphinx.2017.vcxproj             |   5 +-
 w32/download_pocketsphinx.props               |   5 +-
 w32/download_sphinxbase.props                 |   5 +-
 w32/download_sphinxmodel.props                |   2 +-
 w32/pocketsphinx-version.props                |   2 +-
 w32/pocketsphinx.props                        |   2 +-
 w32/sphinxbase-version.props                  |  19 ++
 w32/sphinxbase.props                          |  17 ++
 13 files changed, 265 insertions(+), 195 deletions(-)
 create mode 100644 w32/sphinxbase-version.props
 create mode 100644 w32/sphinxbase.props

diff --git a/debian/util.sh b/debian/util.sh
index 5f3dadcc20..2a826cf63c 100755
--- a/debian/util.sh
+++ b/debian/util.sh
@@ -100,9 +100,9 @@ getlib () {
 
 getlibs () {
   # get pinned libraries
-  getlib http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
-  getlib http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
-  getlib http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
+  getlib https://github.com/freeswitch/windows-deps/releases/download/sphinxbase-0.8/sphinxbase-0.8.tar.gz
+  getlib https://github.com/freeswitch/windows-deps/releases/download/pocketsphinx-0.8/pocketsphinx-0.8.tar.gz
+  getlib https://github.com/freeswitch/windows-deps/releases/download/communicator_semi_6000_20080321/communicator_semi_6000_20080321.tar.gz
   #getlib http://download.zeromq.org/zeromq-2.1.9.tar.gz \
   #  || getlib http://download.zeromq.org/historic/zeromq-2.1.9.tar.gz
   #getlib http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
diff --git a/freeswitch.spec b/freeswitch.spec
index 50cbe8ec96..8c0597701d 100755
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -110,9 +110,9 @@ Vendor:       	http://www.freeswitch.org/
 #
 ######################################################################################################################
 Source0:        http://files.freeswitch.org/%{name}-%{nonparsedversion}.tar.bz2
-Source1:	http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
-Source2:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
-Source3:	http://files.freeswitch.org/downloads/libs/sphinxbase-0.8.tar.gz
+Source1:	https://github.com/freeswitch/windows-deps/releases/download/communicator_semi_6000_20080321/communicator_semi_6000_20080321.tar.gz
+Source2:	https://github.com/freeswitch/windows-deps/releases/download/pocketsphinx-0.8/pocketsphinx-0.8.tar.gz
+Source3:	https://github.com/freeswitch/windows-deps/releases/download/sphinxbase-0.8/sphinxbase-0.8.tar.gz
 Prefix:        	%{prefix}
 
 
diff --git a/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj b/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj
index bc3c995e7d..3d3ef0a07d 100644
--- a/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj
+++ b/libs/win32/pocketsphinx/pocketsphinx.2017.vcxproj
@@ -24,6 +24,8 @@
     <RootNamespace>pocketsphinx</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\w32\pocketsphinx.props" />
+  <Import Project="$(SolutionDir)\w32\sphinxbase.props" />
   <Import Project="$(SolutionDir)\w32\download_pocketsphinx.props" Condition=" '$(downloadpocketsphinxPropsImported)' == '' " />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -88,7 +90,6 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../include;../../../../sphinxbase/include;../../../../sphinxbase/include/win32;..\..\pocketsphinx-0.7/src/libpocketsphinx;..\..\sphinxbase-0.7\include;..\..\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;POCKETSPHINX_EXPORTS;SPHINXDLL;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +119,6 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../../include;../../../../sphinxbase/include;../../../../sphinxbase/include/win32;..\..\pocketsphinx-0.7/src/libpocketsphinx;..\..\sphinxbase-0.7\include;..\..\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;POCKETSPHINX_EXPORTS;SPHINXDLL;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -148,7 +148,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../include;../../../../sphinxbase/include;../../../../sphinxbase/include/win32;..\..\pocketsphinx-0.7/src/libpocketsphinx;..\..\sphinxbase-0.7\include;..\..\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;POCKETSPHINX_EXPORTS;SPHINXDLL;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -182,7 +181,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../include;../../../../sphinxbase/include;../../../../sphinxbase/include/win32;..\..\pocketsphinx-0.7/src/libpocketsphinx;..\..\sphinxbase-0.7\include;..\..\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;POCKETSPHINX_EXPORTS;SPHINXDLL;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -208,47 +206,47 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\acmod.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\bin_mdef.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\blkarray_list.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\acmod.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\bin_mdef.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\blkarray_list.h" />
     <ClInclude Include="..\..\..\include\cmdln_macro.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\cmu6_lts_rules.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\dict.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\dict2pid.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fillpen.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_history.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_lextree.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_search_internal.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\cmu6_lts_rules.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\dict.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\dict2pid.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fillpen.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fsg_history.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fsg_lextree.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fsg_search_internal.h" />
     <ClInclude Include="..\..\..\include\fsg_set.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\hmm.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\kdtree.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\lextree.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\mdef.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ms_gauden.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ms_mgau.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ms_senone.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ngram_search.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ngram_search_fwdflat.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ngram_search_fwdtree.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\phone_loop_search.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\hmm.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\kdtree.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\lextree.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\mdef.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ms_gauden.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ms_mgau.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ms_senone.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ngram_search.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ngram_search_fwdflat.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ngram_search_fwdtree.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\phone_loop_search.h" />
     <ClInclude Include="..\..\..\include\pocketsphinx.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\include\pocketsphinx.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\include\pocketsphinx_export.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\pocketsphinx_internal.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\posixwin32.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ps_lattice.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ps_lattice_internal.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\include\ps_mllr.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\s2_semi_mgau.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\s3dict.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\tmat.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\tst_search.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\vector.h" />
-    <ClInclude Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\vithist.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\include\pocketsphinx.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\include\pocketsphinx_export.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\pocketsphinx_internal.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\posixwin32.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ps_lattice.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ps_lattice_internal.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\include\ps_mllr.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\s2_semi_mgau.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\s3dict.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\tmat.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\tst_search.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\vector.h" />
+    <ClInclude Include="$(pocketsphinx_libDir)\src\libpocketsphinx\vithist.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\acmod.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\bin_mdef.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\acmod.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\bin_mdef.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -258,7 +256,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\blkarray_list.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\blkarray_list.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -268,9 +266,9 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\dict.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\dict2pid.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_history.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\dict.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\dict2pid.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fsg_history.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -280,7 +278,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_lextree.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fsg_lextree.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -290,7 +288,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_search.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\fsg_search.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -300,7 +298,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\hmm.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\hmm.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -310,7 +308,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\mdef.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\mdef.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -320,7 +318,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ms_gauden.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ms_gauden.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -330,7 +328,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ms_mgau.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ms_mgau.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -340,7 +338,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ms_senone.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ms_senone.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -350,15 +348,15 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ngram_search.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ngram_search_fwdflat.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ngram_search_fwdtree.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\phone_loop_search.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\pocketsphinx.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ps_lattice.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ps_mllr.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\ptm_mgau.c" />
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\s2_semi_mgau.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ngram_search.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ngram_search_fwdflat.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ngram_search_fwdtree.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\phone_loop_search.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\pocketsphinx.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ps_lattice.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ps_mllr.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\ptm_mgau.c" />
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\s2_semi_mgau.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -368,7 +366,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\tmat.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\tmat.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -378,7 +376,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\pocketsphinx-0.7\src\libpocketsphinx\vector.c">
+    <ClCompile Include="$(pocketsphinx_libDir)\src\libpocketsphinx\vector.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
diff --git a/libs/win32/sphinxbase/sphinxbase.2017.vcxproj b/libs/win32/sphinxbase/sphinxbase.2017.vcxproj
index b6740664a8..f6cfd655b4 100644
--- a/libs/win32/sphinxbase/sphinxbase.2017.vcxproj
+++ b/libs/win32/sphinxbase/sphinxbase.2017.vcxproj
@@ -24,6 +24,7 @@
     <RootNamespace>sphinxbase</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(SolutionDir)\w32\sphinxbase.props" />
   <Import Project="$(SolutionDir)\w32\download_sphinxbase.props" Condition=" '$(downloadsphinxbasePropsImported)' == '' " />
   <Import Project="$(SolutionDir)\w32\download_sphinxmodel.props" Condition=" '$(downloadsphinxmodelPropsImported)' == '' " />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -89,7 +90,6 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\sphinxbase-0.7\include\win32;..\..\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SPHINXBASE_EXPORTS;HAVE_CONFIG_H;SPHINXDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -119,7 +119,6 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\sphinxbase-0.7\include\win32;..\..\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SPHINXBASE_EXPORTS;HAVE_CONFIG_H;SPHINXDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -149,7 +148,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sphinxbase-0.7\include\win32;..\..\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SPHINXBASE_EXPORTS;HAVE_CONFIG_H;SPHINXDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -182,7 +180,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\sphinxbase-0.7\include\win32;..\..\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SPHINXBASE_EXPORTS;HAVE_CONFIG_H;SPHINXDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -207,7 +204,7 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\feat\agc.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\feat\agc.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -217,7 +214,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\bio.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\bio.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -227,7 +224,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\bitvec.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\bitvec.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -237,7 +234,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\blas_lite.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\blas_lite.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -247,7 +244,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\case.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\case.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -257,7 +254,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\ckd_alloc.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\ckd_alloc.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -267,7 +264,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\cmd_ln.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\cmd_ln.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -277,7 +274,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\feat\cmn.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\feat\cmn.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -287,7 +284,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\feat\cmn_prior.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\feat\cmn_prior.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -297,7 +294,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxad\cont_ad_base.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxad\cont_ad_base.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -307,8 +304,8 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\dtoa.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\err.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\dtoa.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\err.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -318,7 +315,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\f2c_lite.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\errno.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -328,7 +325,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_interface.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\f2c_lite.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -338,7 +335,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_sigproc.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_interface.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -348,7 +345,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_sigproc.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -358,7 +355,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp_affine.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -368,7 +365,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp_inverse_linear.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp_affine.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -378,7 +375,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp_piecewise_linear.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp_inverse_linear.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -388,7 +385,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\feat\feat.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp_piecewise_linear.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -398,7 +395,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\filename.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\feat\feat.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -408,7 +405,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fixlog.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\filename.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -418,8 +415,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\fsg_model.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\genrand.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fixlog.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -429,7 +425,8 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\glist.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\fsg_model.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\genrand.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -439,7 +436,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\hash_table.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\glist.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -449,7 +446,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\heap.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\hash_table.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -459,7 +456,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\info.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\heap.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -469,10 +466,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\jsgf.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\jsgf_parser.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\jsgf_scanner.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\feat\lda.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\huff_code.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -482,10 +476,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\listelem_alloc.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\lm3g_model.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\logmath.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\matrix.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\info.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -495,13 +486,10 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\mmio.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_arpa.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_dmp.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_dmp32.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_set.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\pio.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\jsgf.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\jsgf_parser.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\jsgf_scanner.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\feat\lda.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -511,7 +499,10 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxad\play_win32.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\listelem_alloc.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\lm3g_model.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\logmath.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\matrix.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -521,7 +512,13 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\profile.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\mmio.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_arpa.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_dmp.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_dmp32.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_set.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\pio.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -531,7 +528,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxad\rec_win32.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxad\play_win32.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -541,8 +538,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\sbthread.c" />
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\slamch.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\profile.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -552,7 +548,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\slapack_lite.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxad\rec_win32.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -562,7 +558,8 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\strfuncs.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\sbthread.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\slamch.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -572,7 +569,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\util\unlimit.c">
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\slapack_lite.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -582,68 +579,108 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\yin.c" />
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\strfuncs.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\string_wce.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\unlimit.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\util\utf8.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\yin.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\sphinxbase-0.7\include\ad.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\agc.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\bio.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\bitvec.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\byteorder.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\case.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\ckd_alloc.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\clapack_lite.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\cmd_ln.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\cmn.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\win32\config.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\cont_ad.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\err.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\f2c.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\fe.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_internal.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp_affine.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp_inverse_linear.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\fe\fe_warp_piecewise_linear.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\feat.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\filename.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\fixpoint.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\fsg_model.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\gau_cb.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\gau_cb_float64.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\gau_cb_int32.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\gau_file.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\gau_mix.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\genrand.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\glist.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\hash_table.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\heap.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\info.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\jsgf_internal.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\jsgf_parser.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\jsgf_scanner.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\libutil.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\listelem_alloc.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\lm3g_model.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\logmath.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\matrix.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\mmio.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\mulaw.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\ngram_model.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_arpa.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_dmp.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_internal.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\src\libsphinxbase\lm\ngram_model_set.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\pio.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\prim_type.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\profile.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\s3_arraylist.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\win32\sphinx_config.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\sphinx_types.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\sphinxbase_export.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\strfuncs.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\unlimit.h" />
-    <ClInclude Include="..\..\sphinxbase-0.7\include\yin.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\ad.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\agc.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\bio.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\bitvec.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\byteorder.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\case.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\ckd_alloc.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\clapack_lite.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\cmd_ln.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\cmn.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\win32\config.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\cont_ad.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\err.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\f2c.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\fe.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_internal.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp_affine.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp_inverse_linear.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\fe\fe_warp_piecewise_linear.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\feat.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\filename.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\fixpoint.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\fsg_model.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\gau_cb.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\gau_cb_float64.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\gau_cb_int32.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\gau_file.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\gau_mix.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\genrand.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\glist.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\hash_table.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\heap.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\info.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\jsgf_internal.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\jsgf_parser.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\jsgf_scanner.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\libutil.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\listelem_alloc.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\lm3g_model.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\logmath.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\matrix.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\mmio.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\mulaw.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\ngram_model.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_arpa.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_dmp.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_internal.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\src\libsphinxbase\lm\ngram_model_set.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\pio.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\prim_type.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\profile.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\s3_arraylist.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\win32\sphinx_config.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\sphinx_types.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\sphinxbase_export.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\strfuncs.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\unlimit.h" />
+    <ClInclude Include="$(sphinxbase_libDir)\include\yin.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/scripts/freeswitch.pkg_deps.sh b/scripts/freeswitch.pkg_deps.sh
index d057083993..45add46dd8 100755
--- a/scripts/freeswitch.pkg_deps.sh
+++ b/scripts/freeswitch.pkg_deps.sh
@@ -15,6 +15,6 @@ wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-
 wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-16000-1.0.53.tar.gz
 wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-32000-1.0.53.tar.gz
 wget -c https://github.com/freeswitch/freeswitch-sounds/releases/download/en-us-callie-1.0.53/freeswitch-sounds-en-us-callie-48000-1.0.53.tar.gz
-wget -c http://svn.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz
+wget -c https://github.com/freeswitch/windows-deps/releases/download/communicator_semi_6000_20080321/communicator_semi_6000_20080321.tar.gz
 
 
diff --git a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2017.vcxproj b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2017.vcxproj
index 05c38b75ca..f82fb70d67 100644
--- a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2017.vcxproj
+++ b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2017.vcxproj
@@ -49,6 +49,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(SolutionDir)w32\pocketsphinx.props" />
+  <Import Project="$(SolutionDir)w32\sphinxbase.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -78,7 +79,6 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,6 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -127,7 +126,6 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -157,7 +155,6 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/w32/download_pocketsphinx.props b/w32/download_pocketsphinx.props
index 87c99f57fa..acdd0709aa 100644
--- a/w32/download_pocketsphinx.props
+++ b/w32/download_pocketsphinx.props
@@ -1,6 +1,7 @@
 <?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="pocketsphinx-version.props" Condition=" '$(pocketsphinxVersionImported)' == '' "/>
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
   </ImportGroup>
   <PropertyGroup>
@@ -29,8 +30,8 @@
 
   <Target Name="pocketsphinxDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz"
-           expectfileordirectory="$(BaseDir)libs\pocketsphinx-0.7\Makefile.am"
+           package="https://github.com/freeswitch/windows-deps/releases/download/pocketsphinx-$(pocketsphinxVersion)/pocketsphinx-$(pocketsphinxVersion).tar.gz"
+           expectfileordirectory="$(BaseDir)libs\pocketsphinx-$(pocketsphinxVersion)\Makefile.am"
            outputfolder=""
            outputfilename=""
            extractto="$(BaseDir)libs\"
diff --git a/w32/download_sphinxbase.props b/w32/download_sphinxbase.props
index a916bf8609..6589895148 100644
--- a/w32/download_sphinxbase.props
+++ b/w32/download_sphinxbase.props
@@ -1,6 +1,7 @@
 <?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="sphinxbase-version.props" Condition=" '$(sphinxbaseVersionImported)' == '' "/>
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
   </ImportGroup>
   <PropertyGroup>
@@ -29,8 +30,8 @@
 
   <Target Name="sphinxbaseDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz"
-           expectfileordirectory="$(BaseDir)libs\sphinxbase-0.7\Makefile.am"
+           package="https://github.com/freeswitch/windows-deps/releases/download/sphinxbase-$(sphinxbaseVersion)/sphinxbase-$(sphinxbaseVersion).tar.gz"
+           expectfileordirectory="$(BaseDir)libs\sphinxbase-$(sphinxbaseVersion)\Makefile.am"
            outputfolder=""
            outputfilename=""
            extractto="$(BaseDir)libs\"
diff --git a/w32/download_sphinxmodel.props b/w32/download_sphinxmodel.props
index 3141ef634d..5b5fb12903 100644
--- a/w32/download_sphinxmodel.props
+++ b/w32/download_sphinxmodel.props
@@ -29,7 +29,7 @@
 
   <Target Name="sphinxmodelDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="http://files.freeswitch.org/downloads/libs/communicator_semi_6000_20080321.tar.gz"
+           package="https://github.com/freeswitch/windows-deps/releases/download/communicator_semi_6000_20080321/communicator_semi_6000_20080321.tar.gz"
            expectfileordirectory="$(BaseDir)libs\Communicator_semi_40.cd_semi_6000\noisedict"
            outputfolder=""
            outputfilename=""
diff --git a/w32/pocketsphinx-version.props b/w32/pocketsphinx-version.props
index 1332a7a84a..bfe1e5f767 100644
--- a/w32/pocketsphinx-version.props
+++ b/w32/pocketsphinx-version.props
@@ -5,7 +5,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <pocketsphinxMajorVersion>0</pocketsphinxMajorVersion>
-    <pocketsphinxVersion>0.7</pocketsphinxVersion>
+    <pocketsphinxVersion>0.8</pocketsphinxVersion>
   </PropertyGroup>
   <PropertyGroup>
     <pocketsphinxVersionImported>true</pocketsphinxVersionImported>
diff --git a/w32/pocketsphinx.props b/w32/pocketsphinx.props
index 623e36354f..f86c817c54 100644
--- a/w32/pocketsphinx.props
+++ b/w32/pocketsphinx.props
@@ -10,7 +10,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(pocketsphinx_libDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(pocketsphinx_libDir)\include;$(pocketsphinx_libDir)\src\libpocketsphinx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>POCKETSPHINX_MAJOR_VERSION=$(pocketsphinxMajorVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/w32/sphinxbase-version.props b/w32/sphinxbase-version.props
new file mode 100644
index 0000000000..55ede42d32
--- /dev/null
+++ b/w32/sphinxbase-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">
+    <sphinxbaseVersion>0.8</sphinxbaseVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <sphinxbaseVersionImported>true</sphinxbaseVersionImported>
+  </PropertyGroup>
+  <PropertyGroup />
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="sphinxbaseVersion">
+      <Value>$(sphinxbaseVersion)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/w32/sphinxbase.props b/w32/sphinxbase.props
new file mode 100644
index 0000000000..b5eab97095
--- /dev/null
+++ b/w32/sphinxbase.props
@@ -0,0 +1,17 @@
+<?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="sphinxbase-version.props" Condition=" '$(sphinxbaseVersionImported)' == '' "/>
+  </ImportGroup>
+
+  <PropertyGroup Label="UserMacros">
+    <sphinxbase_libDir>$(BaseDir)libs\sphinxbase-$(sphinxbaseVersion)</sphinxbase_libDir>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(sphinxbase_libDir)\include\win32;$(sphinxbase_libDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+</Project>