pocketsphinx changes for 0.7 for windows - only build test so far for vs2010 - more to come

8092a289 · Jeff Lenk · 441c5034 · 8092a289 · 8092a289 · 8092a289
--- a/libs/win32/Download pocketsphinx.2008.vcproj
+++ b/libs/win32/Download pocketsphinx.2008.vcproj
@@ -75,8 +75,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading pocketsphinx."
-					CommandLine="if not exist &quot;$(ProjectDir)..\pocketsphinx-0.5.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
-					Outputs="$(ProjectDir)..\pocketsphinx-0.5.99"
+					CommandLine="if not exist &quot;$(ProjectDir)..\pocketsphinx-0.7&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)..\pocketsphinx-0.7"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -85,8 +85,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading pocketsphinx."
-					CommandLine="if not exist &quot;$(ProjectDir)..\pocketsphinx-0.5.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
-					Outputs="$(ProjectDir)..\pocketsphinx-0.5.99"
+					CommandLine="if not exist &quot;$(ProjectDir)..\pocketsphinx-0.7&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)..\pocketsphinx-0.7"
 				/>
 			</FileConfiguration>
 		</File>

--- a/libs/win32/Download pocketsphinx.2010.vcxproj
+++ b/libs/win32/Download pocketsphinx.2010.vcxproj
@@ -62,13 +62,13 @@
    <CustomBuild Include="cleancount">
      <FileType>Document</FileType>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading pocketsphinx.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\pocketsphinx-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz "$(ProjectDir).."
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\pocketsphinx-0.5.99;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\pocketsphinx-0.7;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading pocketsphinx.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\pocketsphinx-0.5.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.5.99-20091212.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\pocketsphinx-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/pocketsphinx-0.7.tar.gz "$(ProjectDir).."
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\pocketsphinx-0.5.99;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\pocketsphinx-0.7;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

--- a/libs/win32/Download sphinxbase.2008.vcproj
+++ b/libs/win32/Download sphinxbase.2008.vcproj
@@ -75,8 +75,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading sphinxbase."
-					CommandLine="if not exist &quot;$(ProjectDir)..\sphinxbase-0.4.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
-					Outputs="$(ProjectDir)..\sphinxbase-0.4.99"
+					CommandLine="if not exist &quot;$(ProjectDir)..\sphinxbase-0.7&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)..\sphinxbase-0.7"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -85,8 +85,8 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Downloading sphinxbase."
-					CommandLine="if not exist &quot;$(ProjectDir)..\sphinxbase-0.4.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
-					Outputs="$(ProjectDir)..\sphinxbase-0.4.99"
+					CommandLine="if not exist &quot;$(ProjectDir)..\sphinxbase-0.7&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;"
+					Outputs="$(ProjectDir)..\sphinxbase-0.7"
 				/>
 			</FileConfiguration>
 		</File>

--- a/libs/win32/Download sphinxbase.2010.vcxproj
+++ b/libs/win32/Download sphinxbase.2010.vcxproj
@@ -62,13 +62,13 @@
    <CustomBuild Include="cleancount">
      <FileType>Document</FileType>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading sphinxbase.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\sphinxbase-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz "$(ProjectDir).."
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\sphinxbase-0.4.99;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\sphinxbase-0.7;%(Outputs)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading sphinxbase.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\sphinxbase-0.4.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.4.99-20091212.tar.gz "$(ProjectDir).."
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\sphinxbase-0.7" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/sphinxbase-0.7.tar.gz "$(ProjectDir).."
 </Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\sphinxbase-0.4.99;%(Outputs)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\sphinxbase-0.7;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

--- a/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj
+++ b/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj
--- a/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj
+++ b/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj
--- a/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj.filters
+++ b/libs/win32/pocketsphinx/pocketsphinx.2010.vcxproj.filters
--- a/libs/win32/sphinxbase/sphinxbase.2008.vcproj
+++ b/libs/win32/sphinxbase/sphinxbase.2008.vcproj
--- a/libs/win32/sphinxbase/sphinxbase.2010.vcxproj
+++ b/libs/win32/sphinxbase/sphinxbase.2010.vcxproj
--- a/libs/win32/sphinxbase/sphinxbase.2010.vcxproj.filters
+++ b/libs/win32/sphinxbase/sphinxbase.2010.vcxproj.filters
--- a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj
+++ b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.4.99\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.5.99\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.7\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.7\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.4.99\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.5.99\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.7\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.7\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -193,7 +193,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.4.99\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.5.99\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.7\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.7\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -271,7 +271,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.4.99\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.5.99\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\libs\sphinxbase-0.7\include&quot;;&quot;..\..\..\..\libs\pocketsphinx-0.7\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"

--- a/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2010.vcxproj
+++ b/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2010.vcxproj
@@ -73,7 +73,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.4.99\include;..\..\..\..\libs\pocketsphinx-0.5.99\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;..\..\..\..\libs\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -99,7 +99,7 @@
    </Midl>
    <ClCompile>
      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.4.99\include;..\..\..\..\libs\pocketsphinx-0.5.99\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;..\..\..\..\libs\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>true</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,7 +123,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.4.99\include;..\..\..\..\libs\pocketsphinx-0.5.99\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;..\..\..\..\libs\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -154,7 +154,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.4.99\include;..\..\..\..\libs\pocketsphinx-0.5.99\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\libs\sphinxbase-0.7\include;..\..\..\..\libs\pocketsphinx-0.7\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_POCKETSPHINX_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <FunctionLevelLinking>true</FunctionLevelLinking>