From 4d35c430137e90881e18b09c638459bec6370dab Mon Sep 17 00:00:00 2001 From: Andrey Volk Date: Wed, 16 Sep 2026 23:26:01 +0300 Subject: [PATCH] [Build-System] Windows: Get libsilk v1.0.9_1 pre-compiled package from freeswitch/windows-deps releases instead of building it in tree (#3175) --- .gitignore | 1 + Freeswitch.2017.sln | 14 - libs/win32/libsilk/Silk_FIX.2017.vcxproj | 271 ------------------ src/mod/codecs/mod_silk/mod_silk.2017.vcxproj | 4 - w32/download_libsilk.props | 40 --- w32/libsilk-version.props | 8 +- w32/libsilk.props | 51 +++- 7 files changed, 55 insertions(+), 334 deletions(-) delete mode 100644 libs/win32/libsilk/Silk_FIX.2017.vcxproj delete mode 100644 w32/download_libsilk.props diff --git a/.gitignore b/.gitignore index 032feaa108..9f4e691cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -280,6 +280,7 @@ libs/broadvoice-*.zip libs/lua-*.zip libs/g722_1-*.zip libs/ilbc-*.zip +libs/libsilk-*.zip libs/SharpZipLib.*/ libs/SharpZipLib.*.nupkg libs/nasm-*/ diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln index 2771e97af6..cee8bb0c20 100644 --- a/Freeswitch.2017.sln +++ b/Freeswitch.2017.sln @@ -353,8 +353,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applica EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2017.vcxproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silk_FIX", "libs\win32\libsilk\Silk_FIX.2017.vcxproj", "{56B91D01-9150-4BBF-AFA1-5B68AB991B76}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_avmd", "src\mod\applications\mod_avmd\mod_avmd.2017.vcxproj", "{990BAA76-89D3-4E38-8479-C7B28784EFC8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spandsp", "src\mod\applications\mod_spandsp\mod_spandsp.2017.vcxproj", "{1E21AFE0-6FDB-41D2-942D-863607C24B91}" @@ -1500,17 +1498,6 @@ Global {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|Win32.Build.0 = Release|Win32 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.Build.0 = Release|x64 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|Win32.ActiveCfg = Release|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|Win32.Build.0 = Release|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|x64.ActiveCfg = Release|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|Win32.ActiveCfg = Debug|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|Win32.Build.0 = Debug|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64.ActiveCfg = Debug|x64 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64.Build.0 = Debug|x64 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|Win32.ActiveCfg = Release|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|Win32.Build.0 = Release|Win32 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64.ActiveCfg = Release|x64 - {56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64.Build.0 = Release|x64 {990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|Win32.ActiveCfg = Release|Win32 {990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|Win32.Build.0 = Release|Win32 {990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|x64.ActiveCfg = Release|Win32 @@ -2375,7 +2362,6 @@ Global {ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {EF300386-A8DF-4372-B6D8-FB9BFFCA9AED} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781} - {56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {990BAA76-89D3-4E38-8479-C7B28784EFC8} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {1E21AFE0-6FDB-41D2-942D-863607C24B91} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {2E250296-0C08-4342-9C8A-BCBDD0E7DF65} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} diff --git a/libs/win32/libsilk/Silk_FIX.2017.vcxproj b/libs/win32/libsilk/Silk_FIX.2017.vcxproj deleted file mode 100644 index 23dc50fdf4..0000000000 --- a/libs/win32/libsilk/Silk_FIX.2017.vcxproj +++ /dev/null @@ -1,271 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Silk_FIX - {56B91D01-9150-4BBF-AFA1-5B68AB991B76} - Silk - Win32Proj - - - - StaticLibrary - Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - true - $(DefaultPlatformToolset) - - - StaticLibrary - Unicode - $(DefaultPlatformToolset) - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - - - - Disabled - Neither - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Fast - Level3 - - - - - MaxSpeed - Default - Neither - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - false - false - MultiThreadedDLL - Fast - Level3 - - - - - X64 - - - Disabled - Neither - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Fast - Level3 - - - - - - - - - X64 - - - MaxSpeed - Default - Neither - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - false - false - MultiThreadedDLL - Fast - Level3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/mod/codecs/mod_silk/mod_silk.2017.vcxproj b/src/mod/codecs/mod_silk/mod_silk.2017.vcxproj index 4a92174b83..b078b43ce5 100644 --- a/src/mod/codecs/mod_silk/mod_silk.2017.vcxproj +++ b/src/mod/codecs/mod_silk/mod_silk.2017.vcxproj @@ -126,10 +126,6 @@ - - {56b91d01-9150-4bbf-afa1-5b68ab991b76} - false - {202d7a4e-760d-4d0e-afa1-d7459ced30ff} false diff --git a/w32/download_libsilk.props b/w32/download_libsilk.props deleted file mode 100644 index dc9d99c6bb..0000000000 --- a/w32/download_libsilk.props +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - true - - - - - - - - - diff --git a/w32/libsilk-version.props b/w32/libsilk-version.props index 67515cff76..18ea2041db 100644 --- a/w32/libsilk-version.props +++ b/w32/libsilk-version.props @@ -2,7 +2,8 @@ - 1.0.8 + 1.0.9 + 1 true @@ -13,5 +14,8 @@ $(libsilk_Version) + + $(libsilk_BuildNumber) + - \ No newline at end of file + diff --git a/w32/libsilk.props b/w32/libsilk.props index cafe473a2b..af85a6e5d5 100644 --- a/w32/libsilk.props +++ b/w32/libsilk.props @@ -2,13 +2,58 @@ + - $(SolutionDir)libs\libsilk-$(libsilk_Version)\src + $(BaseDir)libs\libsilk-$(libsilk_Version)_$(libsilk_BuildNumber) + + + + + + + + + + - $(libsilkLibDir)\..\interface;%(AdditionalIncludeDirectories) + $(libsilkLibDir)\include;$(libsilkLibDir)\include\silk;%(AdditionalIncludeDirectories) + + $(libsilkLibDir)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + libsilk.lib;%(AdditionalDependencies) + - \ No newline at end of file +