[SpanDSP] Update to master and fix build on Windows.

diff --git a/Freeswitch.2017.sln b/Freeswitch.2017.sln
index abeeb4fe04a8b3b0e650986256974e260c41a98b..807cb4bf461aed21d432affd33bf5820c8ace455 100644 (file)
--- a/Freeswitch.2017.sln
+++ b/Freeswitch.2017.sln
@@ -534,6 +534,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_tts_format", "tests\un
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_test", "src\mod\applications\mod_test\mod_test.2017.vcxproj", "{E9FF8127-D5F0-2398-59EB-702CE55F7800}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_tx_pre_emphasis_filters", "libs\win32\spandsp\make_v34_tx_pre_emphasis_filters.2017.vcxproj", "{97035E2A-392E-40D1-B27D-DA700A1FDB49}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_shell_map", "libs\win32\spandsp\make_v34_shell_map.2017.vcxproj", "{4A1CA87F-32EF-428E-8D55-7F0D6D91516B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_probe_signals", "libs\win32\spandsp\make_v34_probe_signals.2017.vcxproj", "{D33E088B-0A1A-498E-B825-9E49040E28DF}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_v34_convolutional_coders", "libs\win32\spandsp\make_v34_convolutional_coders.2017.vcxproj", "{368924D6-AC75-42AE-9D64-7E3EB3FD109C}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_godard_descriptor", "libs\win32\spandsp\make_modem_godard_descriptor.2017.vcxproj", "{C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                All|Win32 = All|Win32\r
@@ -2404,6 +2414,66 @@ Global
                {E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|Win32.Build.0 = Release|Win32\r
                {E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|x64.ActiveCfg = Release|x64\r
                {E9FF8127-D5F0-2398-59EB-702CE55F7800}.Release|x64.Build.0 = Release|x64\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|Win32.ActiveCfg = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|Win32.Build.0 = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|x64.ActiveCfg = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.All|x64.Build.0 = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|Win32.ActiveCfg = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|Win32.Build.0 = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|x64.ActiveCfg = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Debug|x64.Build.0 = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|Win32.ActiveCfg = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|Win32.Build.0 = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|x64.ActiveCfg = All|Win32\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49}.Release|x64.Build.0 = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|Win32.ActiveCfg = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|Win32.Build.0 = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|x64.ActiveCfg = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.All|x64.Build.0 = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|Win32.ActiveCfg = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|Win32.Build.0 = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|x64.ActiveCfg = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Debug|x64.Build.0 = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|Win32.ActiveCfg = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|Win32.Build.0 = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|x64.ActiveCfg = All|Win32\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B}.Release|x64.Build.0 = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|Win32.ActiveCfg = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|Win32.Build.0 = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|x64.ActiveCfg = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.All|x64.Build.0 = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|Win32.ActiveCfg = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|Win32.Build.0 = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|x64.ActiveCfg = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Debug|x64.Build.0 = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|Win32.ActiveCfg = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|Win32.Build.0 = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|x64.ActiveCfg = All|Win32\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF}.Release|x64.Build.0 = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|Win32.ActiveCfg = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|Win32.Build.0 = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|x64.ActiveCfg = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.All|x64.Build.0 = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|Win32.ActiveCfg = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|Win32.Build.0 = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|x64.ActiveCfg = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Debug|x64.Build.0 = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|Win32.ActiveCfg = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|Win32.Build.0 = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|x64.ActiveCfg = All|Win32\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C}.Release|x64.Build.0 = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|Win32.ActiveCfg = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|Win32.Build.0 = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|x64.ActiveCfg = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.All|x64.Build.0 = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|Win32.ActiveCfg = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|Win32.Build.0 = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|x64.ActiveCfg = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Debug|x64.Build.0 = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|Win32.ActiveCfg = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|Win32.Build.0 = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|x64.ActiveCfg = All|Win32\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}.Release|x64.Build.0 = All|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -2593,6 +2663,11 @@ Global
                {589A07E7-5DE5-49FD-A62C-27795B806AFB} = {9388C266-C3FC-468A-92EF-0CBC35941412}\r
                {3745B86B-6BE8-3E67-FCB9-BE62A6131D67} = {9388C266-C3FC-468A-92EF-0CBC35941412}\r
                {E9FF8127-D5F0-2398-59EB-702CE55F7800} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
+               {97035E2A-392E-40D1-B27D-DA700A1FDB49} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {4A1CA87F-32EF-428E-8D55-7F0D6D91516B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {D33E088B-0A1A-498E-B825-9E49040E28DF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {368924D6-AC75-42AE-9D64-7E3EB3FD109C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
+               {C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
                SolutionGuid = {09840DE7-9208-45AA-9667-1A71EE93BD1E}\r

diff --git a/libs/.gitignore b/libs/.gitignore
index def72ad13eec001560eab45e9ff18f9596a055f3..9abd38227c8cf26f6c2e84129191ef9688190c13 100644 (file)
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -618,5 +618,7 @@ mariadb-connector-c-*/
 mariadb-connector-c-*
 /spandsp*/
 /spandsp*
+win32/spandsp/filters.csv
 win32/spandsp/spandsp.h
+win32/spandsp/v34_tx_pre_emphasis_filters.h
 win32/spandsp/win32

diff --git a/libs/win32/spandsp/libspandsp.2017.vcxproj b/libs/win32/spandsp/libspandsp.2017.vcxproj
index 6a3d8012d0ccfe702200961d2a0899f67f6b8996..ad6965a005a187bf9a10e43b56dbaa660bbf9eec 100644 (file)
--- a/libs/win32/spandsp/libspandsp.2017.vcxproj
+++ b/libs/win32/spandsp/libspandsp.2017.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -188,6 +188,7 @@
     <ClCompile Include="$(BaseDir)libs\spandsp\src\g711.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\g722.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\g726.c" />
+    <ClCompile Include="$(BaseDir)libs\spandsp\src\godard.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\gsm0610_decode.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\gsm0610_encode.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\gsm0610_long_term.c" />
@@ -254,11 +255,19 @@
     <ClCompile Include="$(BaseDir)libs\spandsp\src\v42.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\v42bis.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\v8.c" />
+    <ClCompile Include="$(BaseDir)libs\spandsp\src\v80.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\vector_float.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\vector_int.c" />
     <ClCompile Include="$(BaseDir)libs\spandsp\src\msvc\gettimeofday.c" />
+    <ClCompile Include="$(BaseDir)libs\spandsp\src\sprt.c" />
+    <ClCompile Include="$(BaseDir)libs\spandsp\src\v150_1.c" />
+    <ClCompile Include="$(BaseDir)libs\spandsp\src\v150_1_sse.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v34_local.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v34_tables.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v34_superconstellation_map.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v150_1_local.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\ademco_contactid.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\adsi.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\alloc.h" />
@@ -290,6 +299,7 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\g711.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\g722.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\g726.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\godard.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\gsm0610.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\hdlc.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\ima_adpcm.h" />
@@ -309,6 +319,8 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\schedule.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\sig_tone.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\silence_gen.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\sprt.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\stdbool.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\super_tone_rx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\super_tone_tx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\swept_tone.h" />
@@ -335,6 +347,9 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\timing.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\tone_detect.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\tone_generate.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\unaligned.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v150_1.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v150_1_sse.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v17rx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v17tx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v18.h" />
@@ -346,6 +361,7 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v42.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v42bis.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v8.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\v80.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\vector_float.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\vector_int.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\version.h" />
@@ -383,6 +399,7 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\schedule.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\sig_tone.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\silence_gen.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\sprt.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\super_tone_rx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\super_tone_tx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\swept_tone.h" />
@@ -405,6 +422,8 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\timezone.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\tone_detect.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\tone_generate.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v150_1.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v150_1_sse.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v17rx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v17tx.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v18.h" />
@@ -416,6 +435,7 @@
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v42.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v42bis.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v8.h" />
+    <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\private\v80.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp\expose.h" />
     <ClInclude Include="$(BaseDir)libs\spandsp\src\spandsp.h" />
     <CustomBuild Include="$(BaseDir)libs\spandsp\src\msvc\spandsp.h">
@@ -464,6 +484,18 @@
       <Project>{eddb8ab9-c53e-44c0-a620-0e86c2cbd5d5}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="make_v34_convolutional_coders.2017.vcxproj">
+      <Project>{368924d6-ac75-42ae-9d64-7e3eb3fd109c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="make_v34_probe_signals.2017.vcxproj">
+      <Project>{d33e088b-0a1a-498e-b825-9e49040e28df}</Project>
+    </ProjectReference>
+    <ProjectReference Include="make_v34_shell_map.2017.vcxproj">
+      <Project>{4a1ca87f-32ef-428e-8d55-7f0d6d91516b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="make_v34_tx_pre_emphasis_filters.2017.vcxproj">
+      <Project>{97035e2a-392e-40d1-b27d-da700a1fdb49}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/libs/win32/spandsp/make_modem_filter.2017.vcxproj b/libs/win32/spandsp/make_modem_filter.2017.vcxproj
index eae331a73afb00f054e550258e27018e77698ac1..fcdee8a4b9bb07b1e34783264afffc84f13b44eb 100644 (file)
--- a/libs/win32/spandsp/make_modem_filter.2017.vcxproj
+++ b/libs/win32/spandsp/make_modem_filter.2017.vcxproj
@@ -79,6 +79,26 @@
 "$(TargetPath)" -m V.27ter2400 -t >"..\..\spandsp\src\v27ter_tx_2400_floating_rrc.h"
 "$(TargetPath)" -m V.27ter4800 -t >"..\..\spandsp\src\v27ter_tx_4800_floating_rrc.h"
 
+"$(TargetPath)" -m V.34_2400 -r >"..\..\spandsp\src\v34_rx_2400_low_carrier_rrc.h"
+"$(TargetPath)" -m V.34_2400_high -r >"..\..\spandsp\src\v34_rx_2400_high_carrier_rrc.h"
+"$(TargetPath)" -m V.34_2743 -r >"..\..\spandsp\src\v34_rx_2743_low_carrier_rrc.h"
+"$(TargetPath)" -m V.34_2743_high -r >"..\..\spandsp\src\v34_rx_2743_high_carrier_rrc.h"
+"$(TargetPath)" -m V.34_2800 -r >"..\..\spandsp\src\v34_rx_2800_low_carrier_rrc.h"
+"$(TargetPath)" -m V.34_2800_high -r >"..\..\spandsp\src\v34_rx_2800_high_carrier_rrc.h"
+"$(TargetPath)" -m V.34_3000 -r >"..\..\spandsp\src\v34_rx_3000_low_carrier_rrc.h"
+"$(TargetPath)" -m V.34_3000_high -r >"..\..\spandsp\src\v34_rx_3000_high_carrier_rrc.h"
+"$(TargetPath)" -m V.34_3200 -r >"..\..\spandsp\src\v34_rx_3200_low_carrier_rrc.h"
+"$(TargetPath)" -m V.34_3200_high -r >"..\..\spandsp\src\v34_rx_3200_high_carrier_rrc.h"
+
+
+"$(TargetPath)" -m V.34_2400   -t >"..\..\spandsp\src\v34_tx_2400_rrc.h"
+"$(TargetPath)" -m V.34_2743   -t >"..\..\spandsp\src\v34_tx_2743_rrc.h"
+"$(TargetPath)" -m V.34_2800   -t >"..\..\spandsp\src\v34_tx_2800_rrc.h"
+"$(TargetPath)" -m V.34_3000   -t >"..\..\spandsp\src\v34_tx_3000_rrc.h"
+"$(TargetPath)" -m V.34_3200   -t >"..\..\spandsp\src\v34_tx_3200_rrc.h"
+"$(TargetPath)" -m V.34_3429   -t >"..\..\spandsp\src\v34_tx_3429_rrc.h"
+
+
 "$(TargetPath)" -m V.29 -r >"..\..\spandsp\src\v29rx_rrc.h"
 "$(TargetPath)" -m V.29 -r >"..\..\spandsp\src\v29rx_floating_rrc.h"
 "$(TargetPath)" -m V.29 -t >"..\..\spandsp\src\v29tx_rrc.h"

diff --git a/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj b/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj
new file mode 100644 (file)
index 0000000..7383622
--- /dev/null
+++ b/libs/win32/spandsp/make_modem_godard_descriptor.2017.vcxproj
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="All|Win32">\r
+      <Configuration>All</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>make_modem_godard_descriptor</ProjectName>\r
+    <RootNamespace>make_modem_godard_descriptor</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{C8EA4AD3-3EDD-4DD1-9D63-4BE22585AA14}</ProjectGuid>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(SolutionDir)\w32\tiff.props" />\r
+    <Import Project="$(SolutionDir)\w32\spandsp.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_modem_godard_descriptor\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">\r
+    <BuildLog>\r
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
+    </BuildLog>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>"$(TargetPath)" 1800.0 2400.0 0.99 1000.0 100.0 15 1 &gt;"..\..\spandsp\src\v17_v32bis_rx_godard.h"\r
+"$(TargetPath)" 1700.0 2400.0 0.99 1000.0 30.0 5 1 &gt;"..\..\spandsp\src\v29rx_godard.h"\r
+</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\spandsp\src\filter_tools.c" />\r
+    <ClCompile Include="..\..\spandsp\src\make_modem_godard_descriptor.c" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\spandsp\src\filter_tools.h" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/libs/win32/spandsp/make_v34_convolutional_coders.2017.vcxproj b/libs/win32/spandsp/make_v34_convolutional_coders.2017.vcxproj
new file mode 100644 (file)
index 0000000..eb07ff3
--- /dev/null
+++ b/libs/win32/spandsp/make_v34_convolutional_coders.2017.vcxproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="All|Win32">\r
+      <Configuration>All</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>make_v34_convolutional_coders</ProjectName>\r
+    <RootNamespace>make_v34_convolutional_coders</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{368924D6-AC75-42AE-9D64-7E3EB3FD109C}</ProjectGuid>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(SolutionDir)\w32\tiff.props" />\r
+    <Import Project="$(SolutionDir)\w32\spandsp.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_v34_convolutional_coders\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">\r
+    <BuildLog>\r
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
+    </BuildLog>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>"$(TargetPath)" &gt;"..\..\spandsp\src\v34_convolutional_coders.h"</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\spandsp\src\make_v34_convolutional_coders.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/libs/win32/spandsp/make_v34_probe_signals.2017.vcxproj b/libs/win32/spandsp/make_v34_probe_signals.2017.vcxproj
new file mode 100644 (file)
index 0000000..258ec79
--- /dev/null
+++ b/libs/win32/spandsp/make_v34_probe_signals.2017.vcxproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="All|Win32">\r
+      <Configuration>All</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>make_v34_probe_signals</ProjectName>\r
+    <RootNamespace>make_v34_probe_signals</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{D33E088B-0A1A-498E-B825-9E49040E28DF}</ProjectGuid>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(SolutionDir)\w32\tiff.props" />\r
+    <Import Project="$(SolutionDir)\w32\spandsp.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_v34_probe_signals\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">\r
+    <BuildLog>\r
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
+    </BuildLog>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;LIBSPANDSP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>"$(TargetPath)" &gt;"..\..\spandsp\src\v34_probe_signals.h"</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\spandsp\src\make_v34_probe_signals.c" />\r
+    <ClCompile Include="..\..\spandsp\src\g711.c" />\r
+    <ClCompile Include="..\..\spandsp\src\alloc.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/libs/win32/spandsp/make_v34_shell_map.2017.vcxproj b/libs/win32/spandsp/make_v34_shell_map.2017.vcxproj
new file mode 100644 (file)
index 0000000..a9d741d
--- /dev/null
+++ b/libs/win32/spandsp/make_v34_shell_map.2017.vcxproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="All|Win32">\r
+      <Configuration>All</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>make_v34_shell_map</ProjectName>\r
+    <RootNamespace>make_v34_shell_map</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{4A1CA87F-32EF-428E-8D55-7F0D6D91516B}</ProjectGuid>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(SolutionDir)\w32\tiff.props" />\r
+    <Import Project="$(SolutionDir)\w32\spandsp.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_v34_shell_map\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">\r
+    <BuildLog>\r
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
+    </BuildLog>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>"$(TargetPath)" &gt;"..\..\spandsp\src\v34_shell_map.h"</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\spandsp\src\make_v34_shell_map.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/libs/win32/spandsp/make_v34_tx_pre_emphasis_filters.2017.vcxproj b/libs/win32/spandsp/make_v34_tx_pre_emphasis_filters.2017.vcxproj
new file mode 100644 (file)
index 0000000..b1826e5
--- /dev/null
+++ b/libs/win32/spandsp/make_v34_tx_pre_emphasis_filters.2017.vcxproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="All|Win32">\r
+      <Configuration>All</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectName>make_v34_tx_pre_emphasis_filters</ProjectName>\r
+    <RootNamespace>make_v34_tx_pre_emphasis_filters</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+    <ProjectGuid>{97035E2A-392E-40D1-B27D-DA700A1FDB49}</ProjectGuid>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="Configuration">\r
+    <ConfigurationType>Application</ConfigurationType>\r
+    <CharacterSet>Unicode</CharacterSet>\r
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="PropertySheets">\r
+    <Import Project="$(SolutionDir)\w32\tiff.props" />\r
+    <Import Project="$(SolutionDir)\w32\spandsp.props" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='All|Win32'">$(PlatformName)\make_v34_tx_pre_emphasis_filters\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='All|Win32'">false</LinkIncremental>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='All|Win32'">\r
+    <BuildLog>\r
+      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>\r
+    </BuildLog>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>.;..\..\spandsp\tools;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <Optimization>Disabled</Optimization>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <MinimalRebuild>true</MinimalRebuild>\r
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <PrecompiledHeader>\r
+      </PrecompiledHeader>\r
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <Link>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Console</SubSystem>\r
+      <TargetMachine>MachineX86</TargetMachine>\r
+    </Link>\r
+    <PostBuildEvent>\r
+      <Command>"$(TargetPath)"</Command>\r
+    </PostBuildEvent>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\spandsp\src\make_v34_tx_pre_emphasis_filters.c" />\r
+    <ClCompile Include="..\..\spandsp\tools\meteor-engine.c" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/w32/download_spandsp.props b/w32/download_spandsp.props
index f02c66a9bda664c90a48593b2b4e66b258c6e6e9..e176e6bfdcf2454055f47bbe431908a0fbde4fd8 100644 (file)
--- a/w32/download_spandsp.props
+++ b/w32/download_spandsp.props
@@ -1,6 +1,7 @@
 <?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="spandsp-version.props" Condition=" '$(SpandspVersionImported)' == '' "/>
     <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
   </ImportGroup>
   <PropertyGroup>
@@ -29,7 +30,7 @@
 
   <Target Name="SpandspDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
       <DownloadPackageTask
-           package="https://github.com/freeswitch/spandsp/archive/0d2e6ac65e0e8f53d652665a743015a88bf048d4.zip"
+           package="https://github.com/freeswitch/spandsp/archive/$(SpandspVersion).zip"
            expectfileordirectory="$(BaseDir)libs\spandsp\configure.ac"
            outputfolder=""
            outputfilename="spandsp-$(SpandspVersion).zip"

diff --git a/w32/spandsp-version.props b/w32/spandsp-version.props
index 214805b0bf445d9defe2b6b2d585a6c8578775b7..7d9cd1cc597301d0804fa918d07d7df94e56c780 100644 (file)
--- a/w32/spandsp-version.props
+++ b/w32/spandsp-version.props
@@ -4,7 +4,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros">\r
-    <SpandspVersion>0d2e6ac65e0e8f53d652665a743015a88bf048d4</SpandspVersion>\r
+    <SpandspVersion>master</SpandspVersion>\r
   </PropertyGroup>\r
   <PropertyGroup>\r
     <SpandspVersionImported>true</SpandspVersionImported>\r