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
This commit is contained in:
Michael Jerris
parent
dced381e66
commit
2506451f8a
|
|
@ -365,12 +365,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\ap
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download SPEEX", "libs\win32\Download SPEEX.vcproj", "{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.vcproj", "{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iksemel", "libs\win32\iksemel\iksemel.vcproj", "{E727E8F6-935D-46FE-8B0E-37834748A0E3}"
|
||||
EndProject
|
||||
|
|
@ -767,10 +762,6 @@ Global
|
|||
{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F057DA7F-79E5-4B00-845C-EF446EF055E3}.Release|Win32.Build.0 = Release|Win32
|
||||
{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC}.Release|Win32.Build.0 = Release|Win32
|
||||
{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{1C469CDD-A3AF-4A94-A592-B2CF12F2D918}.Release|Win32.ActiveCfg = Release|Win32
|
||||
|
|
@ -1000,7 +991,6 @@ Global
|
|||
{1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}
|
||||
{CBEC7225-0C21-4DA8-978E-1F158F8AD950} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
|
||||
{AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
|
||||
{5C9C69D2-8B98-42DA-8D82-6E0B48446FAC} = {C120A020-773F-4EA3-923F-B67AF28B750D}
|
||||
{985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D}
|
||||
{5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}
|
||||
{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories="..\..\speex-1.1.11.1\win32, ..\..\speex-1.1.11.1\include"
|
||||
AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H"
|
||||
RuntimeLibrary="1"
|
||||
PrecompiledHeaderFile=".\Debug/libspeex.pch"
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
InlineFunctionExpansion="2"
|
||||
EnableIntrinsicFunctions="true"
|
||||
FavorSizeOrSpeed="1"
|
||||
AdditionalIncludeDirectories="..\..\speex-1.1.11.1\win32, ..\..\speex-1.1.11.1\include"
|
||||
AdditionalIncludeDirectories="..\..\speex\win32, ..\..\speex\include"
|
||||
PreprocessorDefinitions="inline=__inline;WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H"
|
||||
RuntimeLibrary="0"
|
||||
PrecompiledHeaderFile=".\Release/libspeex.pch"
|
||||
|
|
@ -171,131 +171,135 @@
|
|||
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\bits.c"
|
||||
RelativePath="..\..\speex\libspeex\bits.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\cb_search.c"
|
||||
RelativePath="..\..\speex\libspeex\cb_search.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\exc_10_16_table.c"
|
||||
RelativePath="..\..\speex\libspeex\exc_10_16_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\exc_10_32_table.c"
|
||||
RelativePath="..\..\speex\libspeex\exc_10_32_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\exc_20_32_table.c"
|
||||
RelativePath="..\..\speex\libspeex\exc_20_32_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\exc_5_256_table.c"
|
||||
RelativePath="..\..\speex\libspeex\exc_5_256_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\exc_5_64_table.c"
|
||||
RelativePath="..\..\speex\libspeex\exc_5_64_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\exc_8_128_table.c"
|
||||
RelativePath="..\..\speex\libspeex\exc_8_128_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\filters.c"
|
||||
RelativePath="..\..\speex\libspeex\filters.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\gain_table.c"
|
||||
RelativePath="..\..\speex\libspeex\gain_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\gain_table_lbr.c"
|
||||
RelativePath="..\..\speex\libspeex\gain_table_lbr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\hexc_10_32_table.c"
|
||||
RelativePath="..\..\speex\libspeex\hexc_10_32_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\hexc_table.c"
|
||||
RelativePath="..\..\speex\libspeex\hexc_table.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\high_lsp_tables.c"
|
||||
RelativePath="..\..\speex\libspeex\high_lsp_tables.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\lpc.c"
|
||||
RelativePath="..\..\speex\libspeex\lpc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\lsp.c"
|
||||
RelativePath="..\..\speex\libspeex\lsp.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\lsp_tables_nb.c"
|
||||
RelativePath="..\..\speex\libspeex\lsp_tables_nb.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\ltp.c"
|
||||
RelativePath="..\..\speex\libspeex\ltp.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\math_approx.c"
|
||||
RelativePath="..\..\speex\libspeex\math_approx.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\misc.c"
|
||||
RelativePath="..\..\speex\libspeex\misc.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\modes.c"
|
||||
RelativePath="..\..\speex\libspeex\modes.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\nb_celp.c"
|
||||
RelativePath="..\..\speex\libspeex\nb_celp.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\preprocess.c"
|
||||
RelativePath="..\..\speex\libspeex\preprocess.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\quant_lsp.c"
|
||||
RelativePath="..\..\speex\libspeex\quant_lsp.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\sb_celp.c"
|
||||
RelativePath="..\..\speex\libspeex\sb_celp.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\smallft.c"
|
||||
RelativePath="..\..\speex\libspeex\smallft.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex.c"
|
||||
RelativePath="..\..\speex\libspeex\speex.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_callbacks.c"
|
||||
RelativePath="..\..\speex\libspeex\speex_callbacks.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_header.c"
|
||||
RelativePath="..\..\speex\libspeex\speex_header.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\stereo.c"
|
||||
RelativePath="..\..\speex\libspeex\stereo.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\vbr.c"
|
||||
RelativePath="..\..\speex\libspeex\vbr.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\vq.c"
|
||||
RelativePath="..\..\speex\libspeex\vq.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex\libspeex\window.c"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
|
@ -304,83 +308,83 @@
|
|||
Filter="h;hpp;hxx;hm;inl"
|
||||
>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\cb_search.h"
|
||||
RelativePath="..\..\speex\libspeex\cb_search.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\filters.h"
|
||||
RelativePath="..\..\speex\libspeex\filters.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\lpc.h"
|
||||
RelativePath="..\..\speex\libspeex\lpc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\lsp.h"
|
||||
RelativePath="..\..\speex\libspeex\lsp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\ltp.h"
|
||||
RelativePath="..\..\speex\libspeex\ltp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\misc.h"
|
||||
RelativePath="..\..\speex\libspeex\misc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\modes.h"
|
||||
RelativePath="..\..\speex\libspeex\modes.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\nb_celp.h"
|
||||
RelativePath="..\..\speex\libspeex\nb_celp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\quant_lsp.h"
|
||||
RelativePath="..\..\speex\libspeex\quant_lsp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\sb_celp.h"
|
||||
RelativePath="..\..\speex\libspeex\sb_celp.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\smallft.h"
|
||||
RelativePath="..\..\speex\libspeex\smallft.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex.h"
|
||||
RelativePath="..\..\speex\libspeex\speex.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_bits.h"
|
||||
RelativePath="..\..\speex\libspeex\speex_bits.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_callbacks.h"
|
||||
RelativePath="..\..\speex\libspeex\speex_callbacks.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_denoise.h"
|
||||
RelativePath="..\..\speex\libspeex\speex_denoise.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_header.h"
|
||||
RelativePath="..\..\speex\libspeex\speex_header.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\speex_stereo.h"
|
||||
RelativePath="..\..\speex\libspeex\speex_stereo.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\stack_alloc.h"
|
||||
RelativePath="..\..\speex\libspeex\stack_alloc.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\vbr.h"
|
||||
RelativePath="..\..\speex\libspeex\vbr.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\speex-1.1.11.1\libspeex\vq.h"
|
||||
RelativePath="..\..\speex\libspeex\vq.h"
|
||||
>
|
||||
</File>
|
||||
</Filter>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include\speex""
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include";"$(InputDir)..\..\..\..\libs\speex-1.1.11.1\include\speex""
|
||||
AdditionalIncludeDirectories=""$(InputDir)..\..\..\include";"$(InputDir)include";"$(InputDir)..\..\..\..\libs\include";"$(InputDir)..\..\..\..\libs\speex\include";"$(InputDir)..\..\..\..\libs\speex\include\speex""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
|
|
|
|||
Loading…
Reference in New Issue