Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

[Build-System] Remove mod_unimrcp from the Windows build.

This commit is contained in:
Andrey Volk 2022-08-29 17:50:06 +03:00
parent dd3075a203
commit 193316b244
3 changed files with 25 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Freeswitch.2017.sln
View File

@ -370,8 +370,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbroadvoice", "libs\win32
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bv", "src\mod\codecs\mod_bv\mod_bv.2017.vcxproj", "{D5C87B19-150D-4EF3-A671-96589BD2D14A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_bv", "src\mod\codecs\mod_bv\mod_bv.2017.vcxproj", "{D5C87B19-150D-4EF3-A671-96589BD2D14A}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_unimrcp", "src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj", "{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2017.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcelt", "libs\win32\celt\libcelt.2017.vcxproj", "{ABB71A76-42B0-47A4-973A-42E3D920C6FD}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2017.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FSComm", "fscomm\FSComm.2017.vcxproj", "{7D3122C7-C9D0-3748-81F8-F0DDCB40BF5E}"
@ -1622,17 +1620,6 @@ Global
{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32 {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|Win32.Build.0 = Release|Win32
{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64 {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.ActiveCfg = Release|x64
{D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64 {D5C87B19-150D-4EF3-A671-96589BD2D14A}.Release|x64.Build.0 = Release|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|Win32.ActiveCfg = Release|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.ActiveCfg = Release|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.All|x64.Build.0 = Release|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.ActiveCfg = Debug|Win32
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|Win32.Build.0 = Debug|Win32
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.ActiveCfg = Debug|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Debug|x64.Build.0 = Debug|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.ActiveCfg = Release|Win32
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|Win32.Build.0 = Release|Win32
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.ActiveCfg = Release|x64
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD}.Release|x64.Build.0 = Release|x64
{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64 {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|Win32.ActiveCfg = Release|x64
{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64 {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.ActiveCfg = Release|x64
{ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64 {ABB71A76-42B0-47A4-973A-42E3D920C6FD}.All|x64.Build.0 = Release|x64
@ -2661,7 +2648,6 @@ Global
{432DB165-1EB2-4781-A9C0-71E62610B20A} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {432DB165-1EB2-4781-A9C0-71E62610B20A} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {CF70F278-3364-4395-A2E1-23501C9B8AD2} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
{D07C378A-F5F7-438F-ADF3-4AC4FB1883CD} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}
{ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}

50
libs/win32/apr/apr.hw → libs/win32/apr/fspr.hw
View File

@ -106,7 +106,7 @@
#endif /* !_WINDOWS_ */ #endif /* !_WINDOWS_ */
/** /**
* @defgroup apr_platform Platform Definitions * @defgroup fspr_platform Platform Definitions
* @ingroup APR * @ingroup APR
* @{ * @{
*/ */
@ -275,7 +275,7 @@ extern "C" {
#endif #endif
/** /**
* @addtogroup apr_platform * @addtogroup fspr_platform
* @ingroup APR * @ingroup APR
* @{ * @{
*/ */
@ -322,29 +322,29 @@ extern "C" {
/* Typedefs that APR needs. */ /* Typedefs that APR needs. */
typedef unsigned char apr_byte_t; typedef unsigned char fspr_byte_t;
typedef short apr_int16_t; typedef short fspr_int16_t;
typedef unsigned short apr_uint16_t; typedef unsigned short fspr_uint16_t;
typedef int apr_int32_t; typedef int fspr_int32_t;
typedef unsigned int apr_uint32_t; typedef unsigned int fspr_uint32_t;
typedef __int64 apr_int64_t; typedef __int64 fspr_int64_t;
typedef unsigned __int64 apr_uint64_t; typedef unsigned __int64 fspr_uint64_t;
typedef size_t apr_size_t; typedef size_t fspr_size_t;
#if APR_HAVE_STDDEF_H #if APR_HAVE_STDDEF_H
typedef ptrdiff_t apr_ssize_t; typedef ptrdiff_t fspr_ssize_t;
#else #else
typedef int apr_ssize_t; typedef int fspr_ssize_t;
#endif #endif
#if APR_HAS_LARGE_FILES #if APR_HAS_LARGE_FILES
typedef __int64 apr_off_t; typedef __int64 fspr_off_t;
#else #else
typedef int apr_off_t; typedef int fspr_off_t;
#endif #endif
typedef int apr_socklen_t; typedef int fspr_socklen_t;
/* Are we big endian? */ /* Are we big endian? */
/* XXX: Fatal assumption on Alpha platforms */ /* XXX: Fatal assumption on Alpha platforms */
@ -356,7 +356,7 @@ typedef int apr_socklen_t;
#define APR_SIZEOF_VOIDP 4 #define APR_SIZEOF_VOIDP 4
#endif #endif
/* XXX These simply don't belong here, perhaps in apr_portable.h /* XXX These simply don't belong here, perhaps in fspr_portable.h
* based on some APR_HAVE_PID/GID/UID? * based on some APR_HAVE_PID/GID/UID?
*/ */
typedef int pid_t; typedef int pid_t;
@ -378,8 +378,8 @@ typedef int gid_t;
#ifndef WS2TCPIP_INLINE #ifndef WS2TCPIP_INLINE
#define IN6_IS_ADDR_V4MAPPED(a) \ #define IN6_IS_ADDR_V4MAPPED(a) \
( (*(const apr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \ ( (*(const fspr_uint64_t *)(const void *)(&(a)->s6_addr[0]) == 0) \
&& (*(const apr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff))) && (*(const fspr_uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
#endif #endif
#endif /* APR_HAS_IPV6 */ #endif /* APR_HAS_IPV6 */
@ -391,7 +391,7 @@ typedef int gid_t;
* so that they follow the platform's calling convention. * so that they follow the platform's calling convention.
* @example * @example
*/ */
/** void* APR_THREAD_FUNC my_thread_entry_fn(apr_thread_t *thd, void *data); /** void* APR_THREAD_FUNC my_thread_entry_fn(fspr_thread_t *thd, void *data);
*/ */
#define APR_THREAD_FUNC __stdcall #define APR_THREAD_FUNC __stdcall
@ -406,7 +406,7 @@ typedef int gid_t;
* @remark Both the declaration and implementations must use the same macro. * @remark Both the declaration and implementations must use the same macro.
* @example * @example
*/ */
/** APR_DECLARE(rettype) apr_func(args) /** APR_DECLARE(rettype) fspr_func(args)
* @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA * @see APR_DECLARE_NONSTD @see APR_DECLARE_DATA
* @remark Note that when APR compiles the library itself, it passes the * @remark Note that when APR compiles the library itself, it passes the
* symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32) * symbol -DAPR_DECLARE_EXPORT to the compiler on some platforms (e.g. Win32)
@ -427,7 +427,7 @@ typedef int gid_t;
* @remark Both the declaration and implementations must use the same macro. * @remark Both the declaration and implementations must use the same macro.
* @example * @example
*/ */
/** APR_DECLARE_NONSTD(rettype) apr_func(args, ...); /** APR_DECLARE_NONSTD(rettype) fspr_func(args, ...);
*/ */
#define APR_DECLARE_NONSTD(type) type #define APR_DECLARE_NONSTD(type) type
@ -439,8 +439,8 @@ typedef int gid_t;
* but both must include the macro. * but both must include the macro.
* @example * @example
*/ */
/** extern APR_DECLARE_DATA type apr_variable;\n /** extern APR_DECLARE_DATA type fspr_variable;\n
* APR_DECLARE_DATA type apr_variable = value; * APR_DECLARE_DATA type fspr_variable = value;
*/ */
#define APR_DECLARE_DATA #define APR_DECLARE_DATA
@ -484,12 +484,12 @@ typedef int gid_t;
/* No difference between PROC and GLOBAL mutex */ /* No difference between PROC and GLOBAL mutex */
#define APR_PROC_MUTEX_IS_GLOBAL 1 #define APR_PROC_MUTEX_IS_GLOBAL 1
typedef int apr_wait_t; typedef int fspr_wait_t;
/* struct iovec is needed to emulate Unix writev */ /* struct iovec is needed to emulate Unix writev */
struct iovec { struct iovec {
char* iov_base; char* iov_base;
apr_size_t iov_len; fspr_size_t iov_len;
}; };
/* Nasty Win32 .h ommissions we really need */ /* Nasty Win32 .h ommissions we really need */

16
w32/Setup/Setup.2017.wixproj
View File

@ -385,14 +385,6 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups> <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir> <RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\src\mod\asr_tts\mod_unimrcp\mod_unimrcp.2017.vcxproj">
<Name>mod_unimrcp</Name>
<Project>{d07c378a-f5f7-438f-adf3-4ac4fb1883cd}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\codecs\mod_amr\mod_amr.2017.vcxproj"> <ProjectReference Include="..\..\src\mod\codecs\mod_amr\mod_amr.2017.vcxproj">
<Name>mod_amr</Name> <Name>mod_amr</Name>
<Project>{8deb383c-4091-4f42-a56f-c9e46d552d79}</Project> <Project>{8deb383c-4091-4f42-a56f-c9e46d552d79}</Project>
@ -529,14 +521,6 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups> <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir> <RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_dingaling\mod_dingaling.2017.vcxproj">
<Name>mod_dingaling</Name>
<Project>{ffaa4c52-3a53-4f99-90c1-d59d1f0427f3}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj"> <ProjectReference Include="..\..\src\mod\endpoints\mod_gsmopen\mod_gsmopen.2017.vcxproj">
<Name>mod_gsmopen</Name> <Name>mod_gsmopen</Name>
<Project>{74b120ff-6935-4dfe-a142-cdb6bea99c90}</Project> <Project>{74b120ff-6935-4dfe-a142-cdb6bea99c90}</Project>