[Build-System] Windows: Get libsilk v1.0.9_1 pre-compiled package from freeswitch/windows-deps releases instead of building it in tree (#3175)

This commit is contained in:
Andrey Volk
2026-09-16 23:26:01 +03:00
committed by GitHub
parent 1a11192acf
commit 4d35c43013
7 changed files with 55 additions and 334 deletions
+1
View File
@@ -280,6 +280,7 @@ libs/broadvoice-*.zip
libs/lua-*.zip libs/lua-*.zip
libs/g722_1-*.zip libs/g722_1-*.zip
libs/ilbc-*.zip libs/ilbc-*.zip
libs/libsilk-*.zip
libs/SharpZipLib.*/ libs/SharpZipLib.*/
libs/SharpZipLib.*.nupkg libs/SharpZipLib.*.nupkg
libs/nasm-*/ libs/nasm-*/
-14
View File
@@ -353,8 +353,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_curl", "src\mod\applica
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2017.vcxproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2017.vcxproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}"
EndProject 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}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_avmd", "src\mod\applications\mod_avmd\mod_avmd.2017.vcxproj", "{990BAA76-89D3-4E38-8479-C7B28784EFC8}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spandsp", "src\mod\applications\mod_spandsp\mod_spandsp.2017.vcxproj", "{1E21AFE0-6FDB-41D2-942D-863607C24B91}" 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|Win32.Build.0 = Release|Win32
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.ActiveCfg = Release|x64 {AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.ActiveCfg = Release|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.Build.0 = 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.ActiveCfg = Release|Win32
{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|Win32.Build.0 = Release|Win32 {990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|Win32.Build.0 = Release|Win32
{990BAA76-89D3-4E38-8479-C7B28784EFC8}.All|x64.ActiveCfg = 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} {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}
{56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{990BAA76-89D3-4E38-8479-C7B28784EFC8} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {990BAA76-89D3-4E38-8479-C7B28784EFC8} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{1E21AFE0-6FDB-41D2-942D-863607C24B91} = {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} {2E250296-0C08-4342-9C8A-BCBDD0E7DF65} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
-271
View File
@@ -1,271 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>Silk_FIX</ProjectName>
<ProjectGuid>{56B91D01-9150-4BBF-AFA1-5B68AB991B76}</ProjectGuid>
<RootNamespace>Silk</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(SolutionDir)w32\libsilk.props" />
<Import Project="$(SolutionDir)w32\download_libsilk.props" Condition=" '$(downloadlibsilkPropsImported)' == '' " />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\w32\extlib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\w32\extlib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\w32\extlib.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\w32\extlib.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FloatingPointModel>Fast</FloatingPointModel>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FloatingPointModel>Fast</FloatingPointModel>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FloatingPointModel>Fast</FloatingPointModel>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FloatingPointModel>Fast</FloatingPointModel>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_A2NLSF.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_ana_filt_bank_1.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_apply_sine_window_new.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_array_maxabs.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_autocorr.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_biquad.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_biquad_alt.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_burg_modified.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_bwexpander.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_bwexpander_32.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_CNG.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_code_signs.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_control_audio_bandwidth.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_control_codec_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_corrMatrix_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_create_init_destroy.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_dec_API.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_decode_core.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_decode_frame.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_decode_parameters.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_decode_pitch.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_decode_pulses.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_decoder_set_fs.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_detect_SWB_input.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_enc_API.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_encode_frame_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_encode_parameters.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_encode_pulses.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_find_LPC_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_find_LTP_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_find_pitch_lags_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_find_pred_coefs_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_gain_quant.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_HP_variable_cutoff_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_init_encoder_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_inner_prod_aligned.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_interpolate.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_k2a.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_k2a_Q16.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LBRR_reset.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_lin2log.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_log2lin.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LP_variable_cutoff.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LPC_inv_pred_gain.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LPC_synthesis_filter.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LPC_synthesis_order16.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LSF_cos_table.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LTP_analysis_filter_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_LTP_scale_ctrl_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_MA.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF2A.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF2A_stable.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF_MSVQ_decode.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF_MSVQ_encode_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF_stabilize.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF_VQ_rate_distortion_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF_VQ_sum_error_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NLSF_VQ_weights_laroia.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_noise_shape_analysis_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NSQ.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_NSQ_del_dec.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_pitch_analysis_core.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_pitch_est_tables.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_PLC.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_prefilter_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_process_gains_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_process_NLSFs_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_quant_LTP_gains_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_range_coder.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_regularize_correlations_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_down2.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_down2_3.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_down3.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_AR2.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_ARMA4.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_copy.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_down4.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_down_FIR.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_IIR_FIR.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_up2_HQ.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_private_up4.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_rom.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_resampler_up2.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_residual_energy16_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_residual_energy_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_scale_copy_vector16.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_scale_vector.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_schur.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_schur64.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_shell_coder.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_sigm_Q15.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_solve_LS_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_sort.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_sum_sqr_shift.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_gain.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_LTP.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB0_10.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB0_16.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB1_10.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB1_16.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_other.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_pitch_lag.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_pulses_per_block.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_sign.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_tables_type_offset.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_VAD.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_VQ_nearest_neighbor_FIX.c" />
<ClCompile Include="$(libsilkLibDir)/SKP_Silk_warped_autocorrelation_FIX.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_common_pitch_est_defines.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_define.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_Inlines.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_macros.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_main.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_main_FIX.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_pitch_est_defines.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_PLC.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_resampler_private.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_resampler_rom.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_resampler_structs.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_setup_complexity.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_SigProc_FIX.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_structs.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_structs_FIX.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_tables.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB0_10.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB0_16.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_tables_NLSF_CB1_16.h" />
<ClInclude Include="$(libsilkLibDir)/SKP_Silk_tuning_parameters.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
@@ -126,10 +126,6 @@
<ClCompile Include="mod_silk.c" /> <ClCompile Include="mod_silk.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)libs\win32\libsilk\Silk_FIX.2017.vcxproj">
<Project>{56b91d01-9150-4bbf-afa1-5b68ab991b76}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj"> <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project> <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-40
View File
@@ -1,40 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
</ImportGroup>
<PropertyGroup>
<downloadlibsilkPropsImported>true</downloadlibsilkPropsImported>
</PropertyGroup>
<!--
Download Target.
Name must be unique.
By design, targets are executed only once per project.
Usage:
package: URI
expectfileordirectory: Skips the download and extraction if exists
outputfolder: Folder to store a downloaded file.
By default "$(BaseDir)libs", if empty
outputfilename: If not empty, overrides filename from URI.
.exe files don't get extracted
extractto: Folder to extract an archive to
-->
<Target Name="libsilkDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
<DownloadPackageTask
package="http://files.freeswitch.org/downloads/libs/libsilk-$(libsilk_Version).tar.gz"
expectfileordirectory="$(BaseDir)libs\libsilk-$(libsilk_Version)\Makefile.am"
outputfolder=""
outputfilename=""
extractto="$(BaseDir)libs\"
/>
</Target>
</Project>
+6 -2
View File
@@ -2,7 +2,8 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<libsilk_Version>1.0.8</libsilk_Version> <libsilk_Version>1.0.9</libsilk_Version>
<libsilk_BuildNumber>1</libsilk_BuildNumber>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<libsilk_VersionImported>true</libsilk_VersionImported> <libsilk_VersionImported>true</libsilk_VersionImported>
@@ -13,5 +14,8 @@
<BuildMacro Include="libsilk_Version"> <BuildMacro Include="libsilk_Version">
<Value>$(libsilk_Version)</Value> <Value>$(libsilk_Version)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="libsilk_BuildNumber">
<Value>$(libsilk_BuildNumber)</Value>
</BuildMacro>
</ItemGroup> </ItemGroup>
</Project> </Project>
+48 -3
View File
@@ -2,13 +2,58 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="libsilk-version.props" Condition=" '$(libsilk_VersionImported)' == '' "/> <Import Project="libsilk-version.props" Condition=" '$(libsilk_VersionImported)' == '' "/>
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<libsilkLibDir>$(SolutionDir)libs\libsilk-$(libsilk_Version)\src</libsilkLibDir> <libsilkLibDir>$(BaseDir)libs\libsilk-$(libsilk_Version)_$(libsilk_BuildNumber)</libsilkLibDir>
</PropertyGroup> </PropertyGroup>
<!--
Download Target.
Name must be unique.
By design, targets are executed only once per project.
Usage:
package: URI
expectfileordirectory: Skips the download and extraction if exists
outputfolder: Folder to store a downloaded file.
By default "$(BaseDir)libs", if empty
outputfilename: If not empty, overrides filename from URI.
.exe files don't get extracted
extractto: Folder to extract an archive to
-->
<Target Name="libsilkBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="https://github.com/freeswitch/windows-deps/releases/download/libsilk-v$(libsilk_Version)_$(libsilk_BuildNumber)/libsilk-$(libsilk_Version)_$(libsilk_BuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
expectfileordirectory="$(libsilkLibDir)\binaries\$(Platform)\$(Configuration)\libsilk.lib"
outputfolder=""
outputfilename=""
extractto="$(BaseDir)libs\"
/>
</Target>
<Target Name="libsilkHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="https://github.com/freeswitch/windows-deps/releases/download/libsilk-v$(libsilk_Version)_$(libsilk_BuildNumber)/libsilk-$(libsilk_Version)_$(libsilk_BuildNumber)-headers.zip"
expectfileordirectory="$(libsilkLibDir)\include\silk\SKP_Silk_SDK_API.h"
outputfolder=""
outputfilename=""
extractto="$(BaseDir)libs\"
/>
</Target>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(libsilkLibDir)\..\interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(libsilkLibDir)\include;$(libsilkLibDir)\include\silk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link>
<AdditionalLibraryDirectories>$(libsilkLibDir)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libsilk.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
</Project> </Project>