diff --git a/.gitignore b/.gitignore
index 1941e58ade..673a7a3bbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -295,6 +295,7 @@ libs/mpg123-*/
libs/mpg123-*.zip
libs/ldns-*/
libs/ldns-*.zip
+libs/speex-*.zip
libs/SharpZipLib.*/
libs/SharpZipLib.*.nupkg
libs/nasm-*/
diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
index 433c5978ba..d92ffe969a 100644
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@@ -301,8 +301,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lcr", "src\mod\applicat
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\win32\spandsp\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.2017.vcxproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "libs\win32\speex\libspeexdsp.2017.vcxproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opal", "src\mod\endpoints\mod_opal\mod_opal.2017.vcxproj", "{05C9FB27-480E-4D53-B3B7-6338E2526666}"
@@ -1212,18 +1210,6 @@ Global
{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|Win32.Build.0 = Release|Win32
{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.ActiveCfg = Release|x64
{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}.Release|x64.Build.0 = Release|x64
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|Win32.ActiveCfg = Release_Dynamic|Win32
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|Win32.Build.0 = Release_Dynamic|Win32
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x64.ActiveCfg = Release_Dynamic|x64
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.All|x64.Build.0 = Release_Dynamic|x64
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.ActiveCfg = Debug|Win32
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|Win32.Build.0 = Debug|Win32
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|x64.ActiveCfg = Debug|x64
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Debug|x64.Build.0 = Debug|x64
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.ActiveCfg = Release|Win32
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|Win32.Build.0 = Release|Win32
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|x64.ActiveCfg = Release|x64
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}.Release|x64.Build.0 = Release|x64
{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|Win32.ActiveCfg = Release_Static_SSE|x64
{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x64.ActiveCfg = Release_Static_SSE|x64
{03207781-0D1C-4DB3-A71D-45C608F28DBD}.All|x64.Build.0 = Release_Static_SSE|x64
@@ -2220,7 +2206,6 @@ Global
{329FD5B0-EF28-4606-86D0-F6EA21CF8E36} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
- {E972C52F-9E85-4D65-B19C-031E511E9DB4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{03207781-0D1C-4DB3-A71D-45C608F28DBD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{05C9FB27-480E-4D53-B3B7-6338E2526666} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
{CC1DD008-9406-448D-A0AD-33C3186CFADB} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
diff --git a/libs/.gitignore b/libs/.gitignore
index c34ce55599..ef60896454 100644
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -537,6 +537,7 @@ libg722_1/config/compile
srtp/build/compile
/pcre-*/
/speex-*/
+/speexdsp-*/
/curl-*/
/sqlite-*.zip
/sqlite-*/
diff --git a/libs/win32/speex/config.h b/libs/win32/speex/config.h
deleted file mode 100644
index abd35f0914..0000000000
--- a/libs/win32/speex/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Microsoft version of 'inline'
-#define inline __inline
-
-// Visual Studio support alloca(), but it always align variables to 16-bit
-// boundary, while SSE need 128-bit alignment. So we disable alloca() when
-// SSE is enabled.
-#ifndef _USE_SSE
-# define USE_ALLOCA
-#endif
-
-/* Default to floating point */
-#ifndef FIXED_POINT
-# define FLOATING_POINT
-# define USE_SMALLFT
-#else
-# define USE_KISS_FFT
-#endif
-
-/* We don't support visibility on Win32 */
-#define EXPORT
diff --git a/libs/win32/speex/libspeex.2017.vcxproj b/libs/win32/speex/libspeex.2017.vcxproj
deleted file mode 100644
index 1addcd5c9e..0000000000
--- a/libs/win32/speex/libspeex.2017.vcxproj
+++ /dev/null
@@ -1,644 +0,0 @@
-
-
-
-
- Debug_RTL_dll
- Win32
-
-
- Debug_RTL_dll
- x64
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release_Dynamic
- Win32
-
-
- Release_Dynamic
- x64
-
-
- Release_RTL_dll
- Win32
-
-
- Release_RTL_dll
- x64
-
-
- Release_SSE2
- Win32
-
-
- Release_SSE2
- x64
-
-
- Release_SSE
- Win32
-
-
- Release_SSE
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {E972C52F-9E85-4D65-B19C-031E511E9DB4}
- libspeex
- Win32Proj
- libspeex
-
-
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
- DynamicLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
- DynamicLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- true
- $(DefaultPlatformToolset)
-
-
- StaticLibrary
- MultiByte
- $(DefaultPlatformToolset)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <_ProjectFileVersion>10.0.30319.1
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
- $(Platform)\$(Configuration)\
-
-
-
- Disabled
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
- TurnOffAllWarnings
- CompileAsC
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- false
-
-
- TurnOffAllWarnings
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
- StreamingSIMDExtensions
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
- StreamingSIMDExtensions2
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- libspeex.def
- true
- true
- false
-
-
-
-
-
-
- Disabled
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level4
- EditAndContinue
- CompileAsC
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreadedDLL
- false
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- X64
-
-
- Disabled
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
- TurnOffAllWarnings
- CompileAsC
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- X64
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
- MultiThreadedDLL
- false
- TurnOffAllWarnings
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- X64
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
- StreamingSIMDExtensions
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- X64
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
- StreamingSIMDExtensions2
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- X64
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreaded
- false
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- libspeex.def
- true
- true
- false
-
-
- MachineX64
-
-
-
-
- X64
-
-
- Disabled
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
- EnableFastChecks
- MultiThreadedDebugDLL
-
-
- Level4
- ProgramDatabase
- CompileAsC
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
- X64
-
-
- Full
- AnySuitable
- true
- Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
- true
-
-
- MultiThreadedDLL
- false
-
-
- Level4
- ProgramDatabase
- CompileAsC
- 4244;4305;4311;4100;4127;%(DisableSpecificWarnings)
- /FS %(AdditionalOptions)
-
-
- $(OutDir)libspeex.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libs/win32/speex/libspeexdsp.2017.vcxproj b/libs/win32/speex/libspeexdsp.2017.vcxproj
index 4e2ba30453..9ba52e7359 100644
--- a/libs/win32/speex/libspeexdsp.2017.vcxproj
+++ b/libs/win32/speex/libspeexdsp.2017.vcxproj
@@ -41,7 +41,8 @@
10.0
-
+
+
StaticLibrary
MultiByte
@@ -154,7 +155,7 @@
Disabled
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -171,7 +172,7 @@
Disabled
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -188,7 +189,7 @@
AnySuitable
true
Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -209,7 +210,7 @@
AnySuitable
true
Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
MultiThreadedDLL
@@ -227,7 +228,7 @@
AnySuitable
true
Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
@@ -265,7 +266,7 @@
AnySuitable
true
Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
@@ -300,7 +301,7 @@
AnySuitable
true
Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
@@ -329,7 +330,7 @@
AnySuitable
true
Speed
- $(ProjectDir);..\..\speex-1.2rc1\include;%(AdditionalIncludeDirectories)
+ $(speexdsp_libDir)\win32;%(AdditionalIncludeDirectories)
_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;%(PreprocessorDefinitions)
true
@@ -350,30 +351,39 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/w32/Library/FreeSwitchCore.2017.vcxproj b/w32/Library/FreeSwitchCore.2017.vcxproj
index 43e28e04e1..b75d87e8cb 100644
--- a/w32/Library/FreeSwitchCore.2017.vcxproj
+++ b/w32/Library/FreeSwitchCore.2017.vcxproj
@@ -53,6 +53,8 @@
+
+
@@ -130,7 +132,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
Disabled
- ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)
+ ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)
CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -180,7 +182,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
Disabled
- ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)
+ ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)
CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)
true
EnableFastChecks
@@ -221,7 +223,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
MaxSpeed
- ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)
+ ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)
CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)
MultiThreadedDLL
Create
@@ -259,7 +261,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
MaxSpeed
- ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)
+ ..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)
CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)
MultiThreadedDLL
Create
@@ -792,9 +794,6 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
{03207781-0d1c-4db3-a71d-45c608f28dbd}
false
-
- {e972c52f-9e85-4d65-b19c-031e511e9db4}
-
{eef031cb-fed8-451e-a471-91ec8d4f6750}
false
diff --git a/w32/download_speex.props b/w32/download_speexdsp.props
similarity index 61%
rename from w32/download_speex.props
rename to w32/download_speexdsp.props
index 503db016a1..513478df78 100644
--- a/w32/download_speex.props
+++ b/w32/download_speexdsp.props
@@ -1,10 +1,11 @@
+
- true
+ true
-
+
diff --git a/w32/speex-version.props b/w32/speex-version.props
new file mode 100644
index 0000000000..2f071de699
--- /dev/null
+++ b/w32/speex-version.props
@@ -0,0 +1,21 @@
+
+
+
+
+ 1.2.1
+ 1
+
+
+ true
+
+
+
+
+
+ $(speexVersion)
+
+
+ $(speexBuildNumber)
+
+
+
diff --git a/w32/speex.props b/w32/speex.props
new file mode 100644
index 0000000000..99b82ce38d
--- /dev/null
+++ b/w32/speex.props
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+ $(BaseDir)libs\speex-$(speexVersion)_$(speexBuildNumber)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(speexLibDir)\include;%(AdditionalIncludeDirectories)
+
+
+ $(speexLibDir)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ libspeex.lib;%(AdditionalDependencies)
+
+
+
diff --git a/w32/speexdsp-version.props b/w32/speexdsp-version.props
new file mode 100644
index 0000000000..fc03258b42
--- /dev/null
+++ b/w32/speexdsp-version.props
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ 1.2.1
+
+
+ true
+
+
+
+
+
+ $(speexdspVersion)
+
+
+
diff --git a/w32/speexdsp.props b/w32/speexdsp.props
new file mode 100644
index 0000000000..00362fa611
--- /dev/null
+++ b/w32/speexdsp.props
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+ $(BaseDir)libs\speexdsp-$(speexdspVersion)
+
+
+
+
+ $(speexdsp_libDir)\include;%(AdditionalIncludeDirectories)
+
+
+
+