From 9f7693d8d69d7ea3133c1dc72c712e8eaf006d96 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Sat, 21 Feb 2009 19:38:47 +0000
Subject: [PATCH] fix dependencies so that msvc build works with build solution

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12219 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/spandsp/src/libspandsp.2005.sln          |    2 +
 libs/spandsp/src/libspandsp.2005.vcproj       | 1185 +++++++++++++----
 libs/spandsp/src/libspandsp.2008.sln          |    2 +
 .../src/msvc/make_at_dictionary.2005.vcproj   |    4 +-
 .../src/msvc/make_at_dictionary.2008.vcproj   |    4 +-
 .../src/msvc/make_modem_filter.2005.vcproj    |    4 +-
 .../src/msvc/make_modem_filter.2008.vcproj    |    4 +-
 7 files changed, 956 insertions(+), 249 deletions(-)

diff --git a/libs/spandsp/src/libspandsp.2005.sln b/libs/spandsp/src/libspandsp.2005.sln
index b78079b0c3..d7bbaa4341 100644
--- a/libs/spandsp/src/libspandsp.2005.sln
+++ b/libs/spandsp/src/libspandsp.2005.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "msvc\m
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.2005.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
 	ProjectSection(ProjectDependencies) = postProject
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838} = {329A6FA0-0FCC-4435-A950-E670AEFA9838}
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330} = {DEE932AB-5911-4700-9EEB-8C7090A0A330}
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}
 	EndProjectSection
 EndProject
diff --git a/libs/spandsp/src/libspandsp.2005.vcproj b/libs/spandsp/src/libspandsp.2005.vcproj
index ac9c1e9dbc..2227579b60 100644
--- a/libs/spandsp/src/libspandsp.2005.vcproj
+++ b/libs/spandsp/src/libspandsp.2005.vcproj
@@ -6,24 +6,38 @@
 	ProjectGUID="{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
 	RootNamespace="libspandsp"
 	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
 	>
-  <Platforms>
-    <Platform
+	<Platforms>
+		<Platform
 			Name="Win32"
 		/>
-  </Platforms>
-  <ToolFiles>
-  </ToolFiles>
-  <Configurations>
-    <Configuration
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(SolutionDir)Debug"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="1"
 			>
-      <Tool
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated"
@@ -35,20 +49,51 @@
 				WarningLevel="4"
 				DebugInformationFormat="4"
 				CompileAs="1"
-				DisableSpecificWarnings="4127"
+				DisableSpecificWarnings="4127;4244"
 			/>
-      <Tool
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="./Debug\spandsp.lib"
 				TargetMachine="1"
 			/>
-    </Configuration>
-    <Configuration
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)Release"
 			IntermediateDirectory="$(ConfigurationName)"
@@ -56,7 +101,22 @@
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
-      <Tool
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;.\spandsp;.\msvc;..\..\tiff-3.8.2\libtiff;.\generated"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBSPANDSP_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_CONFIG_H"
@@ -64,242 +124,885 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4127"
+				DisableSpecificWarnings="4127;4244"
 			/>
-      <Tool
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				ImportLibrary="./Release\spandsp.lib"
 				TargetMachine="1"
 			/>
-    </Configuration>
-  </Configurations>
-  <References>
-  </References>
-  <Files>
-    <Filter
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-<File RelativePath="adsi.c"></File>
-<File RelativePath="async.c"></File>
-<File RelativePath="at_interpreter.c"></File>
-<File RelativePath="awgn.c"></File>
-<File RelativePath="bell_r2_mf.c"></File>
-<File RelativePath="bert.c"></File>
-<File RelativePath="bit_operations.c"></File>
-<File RelativePath="bitstream.c"></File>
-<File RelativePath="complex_filters.c"></File>
-<File RelativePath="complex_vector_float.c"></File>
-<File RelativePath="complex_vector_int.c"></File>
-<File RelativePath="crc.c"></File>
-<File RelativePath="dds_float.c"></File>
-<File RelativePath="dds_int.c"></File>
-<File RelativePath="dtmf.c"></File>
-<File RelativePath="echo.c"></File>
-<File RelativePath="fax.c"></File>
-<File RelativePath="fax_modems.c"></File>
-<File RelativePath="fsk.c"></File>
-<File RelativePath="g711.c"></File>
-<File RelativePath="g722.c"></File>
-<File RelativePath="g726.c"></File>
-<File RelativePath="gsm0610_decode.c"></File>
-<File RelativePath="gsm0610_encode.c"></File>
-<File RelativePath="gsm0610_long_term.c"></File>
-<File RelativePath="gsm0610_lpc.c"></File>
-<File RelativePath="gsm0610_preprocess.c"></File>
-<File RelativePath="gsm0610_rpe.c"></File>
-<File RelativePath="gsm0610_short_term.c"></File>
-<File RelativePath="hdlc.c"></File>
-<File RelativePath="ima_adpcm.c"></File>
-<File RelativePath="logging.c"></File>
-<File RelativePath="lpc10_analyse.c"></File>
-<File RelativePath="lpc10_decode.c"></File>
-<File RelativePath="lpc10_encode.c"></File>
-<File RelativePath="lpc10_placev.c"></File>
-<File RelativePath="lpc10_voicing.c"></File>
-<File RelativePath="modem_echo.c"></File>
-<File RelativePath="modem_connect_tones.c"></File>
-<File RelativePath="noise.c"></File>
-<File RelativePath="oki_adpcm.c"></File>
-<File RelativePath="playout.c"></File>
-<File RelativePath="plc.c"></File>
-<File RelativePath="power_meter.c"></File>
-<File RelativePath="queue.c"></File>
-<File RelativePath="schedule.c"></File>
-<File RelativePath="sig_tone.c"></File>
-<File RelativePath="silence_gen.c"></File>
-<File RelativePath="super_tone_rx.c"></File>
-<File RelativePath="super_tone_tx.c"></File>
-<File RelativePath="t4.c"></File>
-<File RelativePath="t30.c"></File>
-<File RelativePath="t30_api.c"></File>
-<File RelativePath="t30_logging.c"></File>
-<File RelativePath="t31.c"></File>
-<File RelativePath="t35.c"></File>
-<File RelativePath="t38_core.c"></File>
-<File RelativePath="t38_gateway.c"></File>
-<File RelativePath="t38_non_ecm_buffer.c"></File>
-<File RelativePath="t38_terminal.c"></File>
-<File RelativePath="testcpuid.c"></File>
-<File RelativePath="time_scale.c"></File>
-<File RelativePath="tone_detect.c"></File>
-<File RelativePath="tone_generate.c"></File>
-<File RelativePath="v17rx.c"></File>
-<File RelativePath="v17tx.c"></File>
-<File RelativePath="v22bis_rx.c"></File>
-<File RelativePath="v22bis_tx.c"></File>
-<File RelativePath="v27ter_rx.c"></File>
-<File RelativePath="v27ter_tx.c"></File>
-<File RelativePath="v29rx.c"></File>
-<File RelativePath="v29tx.c"></File>
-<File RelativePath="v42.c"></File>
-<File RelativePath="v42bis.c"></File>
-<File RelativePath="v8.c"></File>
-<File RelativePath="vector_float.c"></File>
-<File RelativePath="vector_int.c"></File>
-<File RelativePath=".\msvc\gettimeofday.c"></File>
-</Filter><Filter  Name="Header Files">
-<File RelativePath="spandsp/adsi.h"></File>
-<File RelativePath="spandsp/async.h"></File>
-<File RelativePath="spandsp/arctan2.h"></File>
-<File RelativePath="spandsp/at_interpreter.h"></File>
-<File RelativePath="spandsp/awgn.h"></File>
-<File RelativePath="spandsp/bell_r2_mf.h"></File>
-<File RelativePath="spandsp/bert.h"></File>
-<File RelativePath="spandsp/biquad.h"></File>
-<File RelativePath="spandsp/bit_operations.h"></File>
-<File RelativePath="spandsp/bitstream.h"></File>
-<File RelativePath="spandsp/crc.h"></File>
-<File RelativePath="spandsp/complex.h"></File>
-<File RelativePath="spandsp/complex_filters.h"></File>
-<File RelativePath="spandsp/complex_vector_float.h"></File>
-<File RelativePath="spandsp/complex_vector_int.h"></File>
-<File RelativePath="spandsp/dc_restore.h"></File>
-<File RelativePath="spandsp/dds.h"></File>
-<File RelativePath="spandsp/dtmf.h"></File>
-<File RelativePath="spandsp/echo.h"></File>
-<File RelativePath="spandsp/fast_convert.h"></File>
-<File RelativePath="spandsp/fax.h"></File>
-<File RelativePath="spandsp/fax_modems.h"></File>
-<File RelativePath="spandsp/fir.h"></File>
-<File RelativePath="spandsp/fsk.h"></File>
-<File RelativePath="spandsp/g168models.h"></File>
-<File RelativePath="spandsp/g711.h"></File>
-<File RelativePath="spandsp/g722.h"></File>
-<File RelativePath="spandsp/g726.h"></File>
-<File RelativePath="spandsp/gsm0610.h"></File>
-<File RelativePath="spandsp/hdlc.h"></File>
-<File RelativePath="spandsp/ima_adpcm.h"></File>
-<File RelativePath="spandsp/logging.h"></File>
-<File RelativePath="spandsp/lpc10.h"></File>
-<File RelativePath="spandsp/modem_echo.h"></File>
-<File RelativePath="spandsp/modem_connect_tones.h"></File>
-<File RelativePath="spandsp/noise.h"></File>
-<File RelativePath="spandsp/oki_adpcm.h"></File>
-<File RelativePath="spandsp/playout.h"></File>
-<File RelativePath="spandsp/plc.h"></File>
-<File RelativePath="spandsp/power_meter.h"></File>
-<File RelativePath="spandsp/queue.h"></File>
-<File RelativePath="spandsp/saturated.h"></File>
-<File RelativePath="spandsp/schedule.h"></File>
-<File RelativePath="spandsp/sig_tone.h"></File>
-<File RelativePath="spandsp/silence_gen.h"></File>
-<File RelativePath="spandsp/super_tone_rx.h"></File>
-<File RelativePath="spandsp/super_tone_tx.h"></File>
-<File RelativePath="spandsp/t4.h"></File>
-<File RelativePath="spandsp/t30.h"></File>
-<File RelativePath="spandsp/t30_api.h"></File>
-<File RelativePath="spandsp/t30_fcf.h"></File>
-<File RelativePath="spandsp/t30_logging.h"></File>
-<File RelativePath="spandsp/t31.h"></File>
-<File RelativePath="spandsp/t35.h"></File>
-<File RelativePath="spandsp/t38_core.h"></File>
-<File RelativePath="spandsp/t38_gateway.h"></File>
-<File RelativePath="spandsp/t38_non_ecm_buffer.h"></File>
-<File RelativePath="spandsp/t38_terminal.h"></File>
-<File RelativePath="spandsp/telephony.h"></File>
-<File RelativePath="spandsp/time_scale.h"></File>
-<File RelativePath="spandsp/timing.h"></File>
-<File RelativePath="spandsp/tone_detect.h"></File>
-<File RelativePath="spandsp/tone_generate.h"></File>
-<File RelativePath="spandsp/v17rx.h"></File>
-<File RelativePath="spandsp/v17tx.h"></File>
-<File RelativePath="spandsp/v22bis.h"></File>
-<File RelativePath="spandsp/v27ter_rx.h"></File>
-<File RelativePath="spandsp/v27ter_tx.h"></File>
-<File RelativePath="spandsp/v29rx.h"></File>
-<File RelativePath="spandsp/v29tx.h"></File>
-<File RelativePath="spandsp/v42.h"></File>
-<File RelativePath="spandsp/v42bis.h"></File>
-<File RelativePath="spandsp/v8.h"></File>
-<File RelativePath="spandsp/vector_float.h"></File>
-<File RelativePath="spandsp/vector_int.h"></File>
-<File RelativePath="spandsp/version.h"></File>
-<File RelativePath="spandsp/private/adsi.h"></File>
-<File RelativePath="spandsp/private/async.h"></File>
-<File RelativePath="spandsp/private/at_interpreter.h"></File>
-<File RelativePath="spandsp/private/awgn.h"></File>
-<File RelativePath="spandsp/private/bell_r2_mf.h"></File>
-<File RelativePath="spandsp/private/bert.h"></File>
-<File RelativePath="spandsp/private/bitstream.h"></File>
-<File RelativePath="spandsp/private/dtmf.h"></File>
-<File RelativePath="spandsp/private/fax.h"></File>
-<File RelativePath="spandsp/private/fax_modems.h"></File>
-<File RelativePath="spandsp/private/fsk.h"></File>
-<File RelativePath="spandsp/private/g711.h"></File>
-<File RelativePath="spandsp/private/g722.h"></File>
-<File RelativePath="spandsp/private/g726.h"></File>
-<File RelativePath="spandsp/private/gsm0610.h"></File>
-<File RelativePath="spandsp/private/hdlc.h"></File>
-<File RelativePath="spandsp/private/ima_adpcm.h"></File>
-<File RelativePath="spandsp/private/logging.h"></File>
-<File RelativePath="spandsp/private/lpc10.h"></File>
-<File RelativePath="spandsp/private/modem_connect_tones.h"></File>
-<File RelativePath="spandsp/private/noise.h"></File>
-<File RelativePath="spandsp/private/oki_adpcm.h"></File>
-<File RelativePath="spandsp/private/queue.h"></File>
-<File RelativePath="spandsp/private/schedule.h"></File>
-<File RelativePath="spandsp/private/sig_tone.h"></File>
-<File RelativePath="spandsp/private/super_tone_rx.h"></File>
-<File RelativePath="spandsp/private/super_tone_tx.h"></File>
-<File RelativePath="spandsp/private/t30.h"></File>
-<File RelativePath="spandsp/private/t31.h"></File>
-<File RelativePath="spandsp/private/t38_core.h"></File>
-<File RelativePath="spandsp/private/t38_gateway.h"></File>
-<File RelativePath="spandsp/private/t38_non_ecm_buffer.h"></File>
-<File RelativePath="spandsp/private/t38_terminal.h"></File>
-<File RelativePath="spandsp/private/t4.h"></File>
-<File RelativePath="spandsp/private/time_scale.h"></File>
-<File RelativePath="spandsp/private/tone_detect.h"></File>
-<File RelativePath="spandsp/private/tone_generate.h"></File>
-<File RelativePath="spandsp/private/v17rx.h"></File>
-<File RelativePath="spandsp/private/v17tx.h"></File>
-<File RelativePath="spandsp/private/v22bis.h"></File>
-<File RelativePath="spandsp/private/v27ter_rx.h"></File>
-<File RelativePath="spandsp/private/v27ter_tx.h"></File>
-<File RelativePath="spandsp/private/v29rx.h"></File>
-<File RelativePath="spandsp/private/v29tx.h"></File>
-<File RelativePath="spandsp/private/v42.h"></File>
-<File RelativePath="spandsp/private/v42bis.h"></File>
-<File RelativePath="spandsp/private/v8.h"></File>
-<File RelativePath="spandsp/expose.h"></File>
-<File RelativePath="spandsp.h"></File>
-		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+			<File
+				RelativePath="adsi.c"
+				>
+			</File>
+			<File
+				RelativePath="async.c"
+				>
+			</File>
+			<File
+				RelativePath="at_interpreter.c"
+				>
+			</File>
+			<File
+				RelativePath="awgn.c"
+				>
+			</File>
+			<File
+				RelativePath="bell_r2_mf.c"
+				>
+			</File>
+			<File
+				RelativePath="bert.c"
+				>
+			</File>
+			<File
+				RelativePath="bit_operations.c"
+				>
+			</File>
+			<File
+				RelativePath="bitstream.c"
+				>
+			</File>
+			<File
+				RelativePath="complex_filters.c"
+				>
+			</File>
+			<File
+				RelativePath="complex_vector_float.c"
+				>
+			</File>
+			<File
+				RelativePath="complex_vector_int.c"
+				>
+			</File>
+			<File
+				RelativePath="crc.c"
+				>
+			</File>
+			<File
+				RelativePath="dds_float.c"
+				>
+			</File>
+			<File
+				RelativePath="dds_int.c"
+				>
+			</File>
+			<File
+				RelativePath="dtmf.c"
+				>
+			</File>
+			<File
+				RelativePath="echo.c"
+				>
+			</File>
+			<File
+				RelativePath="fax.c"
+				>
+			</File>
+			<File
+				RelativePath="fax_modems.c"
+				>
+			</File>
+			<File
+				RelativePath="fsk.c"
+				>
+			</File>
+			<File
+				RelativePath="g711.c"
+				>
+			</File>
+			<File
+				RelativePath="g722.c"
+				>
+			</File>
+			<File
+				RelativePath="g726.c"
+				>
+			</File>
+			<File
+				RelativePath=".\msvc\gettimeofday.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_decode.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_encode.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_long_term.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_lpc.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_preprocess.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_rpe.c"
+				>
+			</File>
+			<File
+				RelativePath="gsm0610_short_term.c"
+				>
+			</File>
+			<File
+				RelativePath="hdlc.c"
+				>
+			</File>
+			<File
+				RelativePath="ima_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="logging.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_analyse.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_decode.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_encode.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_placev.c"
+				>
+			</File>
+			<File
+				RelativePath="lpc10_voicing.c"
+				>
+			</File>
+			<File
+				RelativePath="modem_connect_tones.c"
+				>
+			</File>
+			<File
+				RelativePath="modem_echo.c"
+				>
+			</File>
+			<File
+				RelativePath="noise.c"
+				>
+			</File>
+			<File
+				RelativePath="oki_adpcm.c"
+				>
+			</File>
+			<File
+				RelativePath="playout.c"
+				>
+			</File>
+			<File
+				RelativePath="plc.c"
+				>
+			</File>
+			<File
+				RelativePath="power_meter.c"
+				>
+			</File>
+			<File
+				RelativePath="queue.c"
+				>
+			</File>
+			<File
+				RelativePath="schedule.c"
+				>
+			</File>
+			<File
+				RelativePath="sig_tone.c"
+				>
+			</File>
+			<File
+				RelativePath="silence_gen.c"
+				>
+			</File>
+			<File
+				RelativePath="super_tone_rx.c"
+				>
+			</File>
+			<File
+				RelativePath="super_tone_tx.c"
+				>
+			</File>
+			<File
+				RelativePath="t30.c"
+				>
+			</File>
+			<File
+				RelativePath="t30_api.c"
+				>
+			</File>
+			<File
+				RelativePath="t30_logging.c"
+				>
+			</File>
+			<File
+				RelativePath="t31.c"
+				>
+			</File>
+			<File
+				RelativePath="t35.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_core.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_gateway.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_non_ecm_buffer.c"
+				>
+			</File>
+			<File
+				RelativePath="t38_terminal.c"
+				>
+			</File>
+			<File
+				RelativePath="t4.c"
+				>
+			</File>
+			<File
+				RelativePath="testcpuid.c"
+				>
+			</File>
+			<File
+				RelativePath="time_scale.c"
+				>
+			</File>
+			<File
+				RelativePath="tone_detect.c"
+				>
+			</File>
+			<File
+				RelativePath="tone_generate.c"
+				>
+			</File>
+			<File
+				RelativePath="v17rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v17tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v22bis_rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v22bis_tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v27ter_rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v27ter_tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v29rx.c"
+				>
+			</File>
+			<File
+				RelativePath="v29tx.c"
+				>
+			</File>
+			<File
+				RelativePath="v42.c"
+				>
+			</File>
+			<File
+				RelativePath="v42bis.c"
+				>
+			</File>
+			<File
+				RelativePath="v8.c"
+				>
+			</File>
+			<File
+				RelativePath="vector_float.c"
+				>
+			</File>
+			<File
+				RelativePath="vector_int.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="spandsp.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/adsi.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/arctan2.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/async.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/at_interpreter.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/awgn.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bell_r2_mf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bert.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/biquad.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bit_operations.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/bitstream.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex_filters.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex_vector_float.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/complex_vector_int.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/crc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/dc_restore.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/dds.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/dtmf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/echo.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/expose.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fast_convert.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fax.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fax_modems.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fir.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/fsk.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g168models.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g711.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g722.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/g726.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/gsm0610.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/hdlc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/ima_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/logging.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/lpc10.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/modem_connect_tones.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/modem_echo.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/noise.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/oki_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/playout.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/plc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/power_meter.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/adsi.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/async.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/at_interpreter.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/awgn.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/bell_r2_mf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/bert.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/bitstream.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/dtmf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/fax.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/fax_modems.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/fsk.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/g711.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/g722.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/g726.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/gsm0610.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/hdlc.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/ima_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/logging.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/lpc10.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/modem_connect_tones.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/noise.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/oki_adpcm.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/queue.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/schedule.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/sig_tone.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/super_tone_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/super_tone_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t30.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t31.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_core.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_gateway.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_non_ecm_buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t38_terminal.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/t4.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/time_scale.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/tone_detect.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/tone_generate.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v17rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v17tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v22bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v27ter_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v27ter_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v29rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v29tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v42.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v42bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/private/v8.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/queue.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/saturated.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/schedule.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/sig_tone.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/silence_gen.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/super_tone_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/super_tone_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30_api.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30_fcf.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t30_logging.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t31.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t35.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_core.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_gateway.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_non_ecm_buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t38_terminal.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/t4.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/telephony.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/time_scale.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/timing.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/tone_detect.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/tone_generate.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v17rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v17tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v22bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v27ter_rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v27ter_tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v29rx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v29tx.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v42.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v42bis.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/v8.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/vector_float.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/vector_int.h"
+				>
+			</File>
+			<File
+				RelativePath="spandsp/version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/libs/spandsp/src/libspandsp.2008.sln b/libs/spandsp/src/libspandsp.2008.sln
index 2602184d38..257ab1c335 100644
--- a/libs/spandsp/src/libspandsp.2008.sln
+++ b/libs/spandsp/src/libspandsp.2008.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "msvc\m
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libspandsp.2008.vcproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
 	ProjectSection(ProjectDependencies) = postProject
+		{329A6FA0-0FCC-4435-A950-E670AEFA9838} = {329A6FA0-0FCC-4435-A950-E670AEFA9838}
+		{DEE932AB-5911-4700-9EEB-8C7090A0A330} = {DEE932AB-5911-4700-9EEB-8C7090A0A330}
 		{401A40CD-5DB4-4E34-AC68-FA99E9FAC014} = {401A40CD-5DB4-4E34-AC68-FA99E9FAC014}
 	EndProjectSection
 EndProject
diff --git a/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj b/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj
index 2e947066d3..3cefdc00f8 100644
--- a/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj
+++ b/libs/spandsp/src/msvc/make_at_dictionary.2005.vcproj
@@ -47,7 +47,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
diff --git a/libs/spandsp/src/msvc/make_at_dictionary.2008.vcproj b/libs/spandsp/src/msvc/make_at_dictionary.2008.vcproj
index 54dda51ac8..b50bb0d687 100644
--- a/libs/spandsp/src/msvc/make_at_dictionary.2008.vcproj
+++ b/libs/spandsp/src/msvc/make_at_dictionary.2008.vcproj
@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
diff --git a/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj b/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj
index e4cbad8852..6a1fb352f0 100644
--- a/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj
+++ b/libs/spandsp/src/msvc/make_modem_filter.2005.vcproj
@@ -47,7 +47,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
diff --git a/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj b/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj
index 5be6875c87..6a296043e1 100644
--- a/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj
+++ b/libs/spandsp/src/msvc/make_modem_filter.2008.vcproj
@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"