move windows build to use the in tree speex

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3760 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Freeswitch.sln b/Freeswitch.sln
index 7664724c94f9f40ce5b327b214ed42de83c121a4..5a215c5a6b7c67964642fdb24af4581609326c7d 100644 (file)
--- a/Freeswitch.sln
+++ b/Freeswitch.sln
@@ -365,12 +365,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\ap
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.vcproj", "{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.vcproj", "{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.vcproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"\r
 EndProject\r
@@ -767,10 +762,6 @@ Global
                {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32\r
                {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32\r
                {F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32\r
-               {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.Build.0 = Debug|Win32\r
-               {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.ActiveCfg = Release|Win32\r
-               {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.Build.0 = Release|Win32\r
                {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.Build.0 = Debug|Win32\r
                {1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -1000,7 +991,6 @@ Global
                {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}\r
                {CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
                {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
-               {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r

diff --git a/libs/win32/speex/libspeex.vcproj b/libs/win32/speex/libspeex.vcproj
index e32293534533aabef74bbc784dfaaecb746cdf78..f9133b98a569a9779b7f57601d743dfae43aaaee 100644 (file)
--- a/libs/win32/speex/libspeex.vcproj
+++ b/libs/win32/speex/libspeex.vcproj
@@ -44,7 +44,7 @@
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               AdditionalIncludeDirectories="..\..\speex-1.1.11.1\win32, ..\..\speex-1.1.11.1\include"\r
+                               AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\Debug/libspeex.pch"\r
@@ -118,7 +118,7 @@
                                InlineFunctionExpansion="2"\r
                                EnableIntrinsicFunctions="true"\r
                                FavorSizeOrSpeed="1"\r
-                               AdditionalIncludeDirectories="..\..\speex-1.1.11.1\win32, ..\..\speex-1.1.11.1\include"\r
+                               AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include"\r
                                PreprocessorDefinitions="inline=__inline;WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H"\r
                                RuntimeLibrary="0"\r
                                PrecompiledHeaderFile=".\Release/libspeex.pch"\r
@@ -171,131 +171,135 @@
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\bits.c"\r
+                               RelativePath="..\..\speex\libspeex\bits.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\cb_search.c"\r
+                               RelativePath="..\..\speex\libspeex\cb_search.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\exc_10_16_table.c"\r
+                               RelativePath="..\..\speex\libspeex\exc_10_16_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\exc_10_32_table.c"\r
+                               RelativePath="..\..\speex\libspeex\exc_10_32_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\exc_20_32_table.c"\r
+                               RelativePath="..\..\speex\libspeex\exc_20_32_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\exc_5_256_table.c"\r
+                               RelativePath="..\..\speex\libspeex\exc_5_256_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\exc_5_64_table.c"\r
+                               RelativePath="..\..\speex\libspeex\exc_5_64_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\exc_8_128_table.c"\r
+                               RelativePath="..\..\speex\libspeex\exc_8_128_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\filters.c"\r
+                               RelativePath="..\..\speex\libspeex\filters.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\gain_table.c"\r
+                               RelativePath="..\..\speex\libspeex\gain_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\gain_table_lbr.c"\r
+                               RelativePath="..\..\speex\libspeex\gain_table_lbr.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\hexc_10_32_table.c"\r
+                               RelativePath="..\..\speex\libspeex\hexc_10_32_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\hexc_table.c"\r
+                               RelativePath="..\..\speex\libspeex\hexc_table.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\high_lsp_tables.c"\r
+                               RelativePath="..\..\speex\libspeex\high_lsp_tables.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\lpc.c"\r
+                               RelativePath="..\..\speex\libspeex\lpc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\lsp.c"\r
+                               RelativePath="..\..\speex\libspeex\lsp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\lsp_tables_nb.c"\r
+                               RelativePath="..\..\speex\libspeex\lsp_tables_nb.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\ltp.c"\r
+                               RelativePath="..\..\speex\libspeex\ltp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\math_approx.c"\r
+                               RelativePath="..\..\speex\libspeex\math_approx.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\misc.c"\r
+                               RelativePath="..\..\speex\libspeex\misc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\modes.c"\r
+                               RelativePath="..\..\speex\libspeex\modes.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\nb_celp.c"\r
+                               RelativePath="..\..\speex\libspeex\nb_celp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\preprocess.c"\r
+                               RelativePath="..\..\speex\libspeex\preprocess.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\quant_lsp.c"\r
+                               RelativePath="..\..\speex\libspeex\quant_lsp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\sb_celp.c"\r
+                               RelativePath="..\..\speex\libspeex\sb_celp.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\smallft.c"\r
+                               RelativePath="..\..\speex\libspeex\smallft.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex.c"\r
+                               RelativePath="..\..\speex\libspeex\speex.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_callbacks.c"\r
+                               RelativePath="..\..\speex\libspeex\speex_callbacks.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_header.c"\r
+                               RelativePath="..\..\speex\libspeex\speex_header.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\stereo.c"\r
+                               RelativePath="..\..\speex\libspeex\stereo.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\vbr.c"\r
+                               RelativePath="..\..\speex\libspeex\vbr.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\vq.c"\r
+                               RelativePath="..\..\speex\libspeex\vq.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\speex\libspeex\window.c"\r
                                >\r
                        </File>\r
                </Filter>\r
@@ -304,83 +308,83 @@
                        Filter="h;hpp;hxx;hm;inl"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\cb_search.h"\r
+                               RelativePath="..\..\speex\libspeex\cb_search.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\filters.h"\r
+                               RelativePath="..\..\speex\libspeex\filters.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\lpc.h"\r
+                               RelativePath="..\..\speex\libspeex\lpc.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\lsp.h"\r
+                               RelativePath="..\..\speex\libspeex\lsp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\ltp.h"\r
+                               RelativePath="..\..\speex\libspeex\ltp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\misc.h"\r
+                               RelativePath="..\..\speex\libspeex\misc.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\modes.h"\r
+                               RelativePath="..\..\speex\libspeex\modes.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\nb_celp.h"\r
+                               RelativePath="..\..\speex\libspeex\nb_celp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\quant_lsp.h"\r
+                               RelativePath="..\..\speex\libspeex\quant_lsp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\sb_celp.h"\r
+                               RelativePath="..\..\speex\libspeex\sb_celp.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\smallft.h"\r
+                               RelativePath="..\..\speex\libspeex\smallft.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex.h"\r
+                               RelativePath="..\..\speex\libspeex\speex.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_bits.h"\r
+                               RelativePath="..\..\speex\libspeex\speex_bits.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_callbacks.h"\r
+                               RelativePath="..\..\speex\libspeex\speex_callbacks.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_denoise.h"\r
+                               RelativePath="..\..\speex\libspeex\speex_denoise.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_header.h"\r
+                               RelativePath="..\..\speex\libspeex\speex_header.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\speex_stereo.h"\r
+                               RelativePath="..\..\speex\libspeex\speex_stereo.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\stack_alloc.h"\r
+                               RelativePath="..\..\speex\libspeex\stack_alloc.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\vbr.h"\r
+                               RelativePath="..\..\speex\libspeex\vbr.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\speex-1.1.11.1\libspeex\vq.h"\r
+                               RelativePath="..\..\speex\libspeex\vq.h"\r
                                >\r
                        </File>\r
                </Filter>\r

diff --git a/src/mod/codecs/mod_speex/mod_speex.vcproj b/src/mod/codecs/mod_speex/mod_speex.vcproj
index 8f880beefbb516faa86e77add165f9880a764051..2accfeefea2c75244b81cc683149675277c3da9c 100644 (file)
--- a/src/mod/codecs/mod_speex/mod_speex.vcproj
+++ b/src/mod/codecs/mod_speex/mod_speex.vcproj
@@ -42,7 +42,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include\speex&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex\include\speex&quot;"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -124,7 +124,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include\speex&quot;"\r
+                               AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\include&quot;;&quot;$(InputDir)include&quot;;&quot;$(InputDir)..\..\..\..\libs\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex\include&quot;;&quot;$(InputDir)..\..\..\..\libs\speex\include\speex&quot;"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"\r
                                RuntimeLibrary="0"\r
                                UsePrecompiledHeader="0"\r