FS-3348 --resolve pocketsphinx build for 0.7 windows vs2008

diff --git a/libs/.gitignore b/libs/.gitignore
index 8a97e19fe2d2c09ed691a7dab8fe7b56ebdd1535..4d2fea4b227e6535dba4e4508347f4385abcedb0 100644 (file)
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -1047,7 +1047,7 @@
 /libshout-2.2.2/
 /mpg123/
 /openldap-2.4.19/
-/pocketsphinx-0.5.99/
+/pocketsphinx-0.7/
 /portaudio/bin-stamp
 /portaudio/bin/
 /portaudio/lib-stamp
@@ -1055,7 +1055,7 @@
 /silk/Encoder
 /silk/signalCompare
 /soundtouch-1.3.1/
-/sphinxbase-0.4.99/
+/sphinxbase-0.7/
 /unimrcp/platforms/asr-client/asrclient
 /unimrcp/platforms/umc/umc
 /unimrcp/platforms/unimrcp-client/unimrcpclient
@@ -1079,7 +1079,6 @@
 /libogg-1.1.3/
 /pthreads-w32-2-7-0-release/
 /sounds/
-/sphinxbase-0.4.99/
 /sofia-sip/libsofia-sip-ua/http/http_tag_dll.c
 /sofia-sip/libsofia-sip-ua/iptsec/auth_tag_dll.c
 /sofia-sip/libsofia-sip-ua/msg/msg_tag_dll.c

diff --git a/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj b/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj
index f338ba4d6f04df09a64d5935feeb8866c19769fe..047cc02ad0a8123459123b03f294d0fdfa733589 100644 (file)
--- a/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj
+++ b/libs/win32/pocketsphinx/pocketsphinx.2008.vcproj
@@ -621,17 +621,13 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\cmu6_lts_rules.c"\r
+                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\dict.c"\r
                                >\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\dict2pid.c"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\fillpen.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\fsg_history.c"\r
                                >\r
@@ -792,50 +788,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\kdtree.c"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\lextree.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\mdef.c"\r
                                >\r
@@ -1024,6 +976,10 @@
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\ps_mllr.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\ptm_mgau.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\s2_semi_mgau.c"\r
                                >\r
@@ -1064,10 +1020,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\s3dict.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\tmat.c"\r
                                >\r
@@ -1108,10 +1060,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\tst_search.c"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\vector.c"\r
                                >\r
@@ -1152,10 +1100,6 @@
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\pocketsphinx-0.7\src\libpocketsphinx\vithist.c"\r
-                               >\r
-                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r