From 94568cb6ccdc4d8da23b110df867e697ff4b2103 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Wed, 20 Dec 2006 19:15:22 +0000
Subject: [PATCH] move windows build to use the in tree libsndfile

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3762 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 Freeswitch.sln                          |  10 --
 libs/win32/libsndfile/libsndfile.vcproj | 128 ++++++++++++------------
 2 files changed, 64 insertions(+), 74 deletions(-)

diff --git a/Freeswitch.sln b/Freeswitch.sln
index 5a215c5a6b..17b104432e 100644
--- a/Freeswitch.sln
+++ b/Freeswitch.sln
@@ -389,12 +389,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static librar
 		{0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}"
 EndProject
@@ -790,10 +785,6 @@ Global
 		{49C34584-B6DA-448F-83CF-27584DC9FC90}.Debug|Win32.Build.0 = Debug|Win32
 		{49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.ActiveCfg = Release|Win32
 		{49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.Build.0 = Release|Win32
-		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Debug|Win32.Build.0 = Debug|Win32
-		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Release|Win32.ActiveCfg = Release|Win32
-		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Release|Win32.Build.0 = Release|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.Build.0 = Debug|Win32
 		{3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.ActiveCfg = Release|Win32
@@ -993,7 +984,6 @@ Global
 		{AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}
 		{985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}
-		{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{8B2CE7D1-77EF-45ED-927D-82147805440B} = {C120A020-773F-4EA3-923F-B67AF28B750D}
 		{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}
diff --git a/libs/win32/libsndfile/libsndfile.vcproj b/libs/win32/libsndfile/libsndfile.vcproj
index 133a4d8a72..7d24c2bce9 100644
--- a/libs/win32/libsndfile/libsndfile.vcproj
+++ b/libs/win32/libsndfile/libsndfile.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="true"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\libsndfile-1.0.16\src;."
+				AdditionalIncludeDirectories="..\..\libsndfile\src;."
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="true"
-				AdditionalIncludeDirectories="..\..\libsndfile-1.0.16\src;."
+				AdditionalIncludeDirectories="..\..\libsndfile\src;."
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -153,31 +153,31 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\aiff.c"
+				RelativePath="..\..\libsndfile\src\aiff.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\alaw.c"
+				RelativePath="..\..\libsndfile\src\alaw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\au.c"
+				RelativePath="..\..\libsndfile\src\au.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\avr.c"
+				RelativePath="..\..\libsndfile\src\avr.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\broadcast.c"
+				RelativePath="..\..\libsndfile\src\broadcast.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\caf.c"
+				RelativePath="..\..\libsndfile\src\caf.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\command.c"
+				RelativePath="..\..\libsndfile\src\command.c"
 				>
 			</File>
 			<File
@@ -185,35 +185,35 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\dither.c"
+				RelativePath="..\..\libsndfile\src\dither.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\double64.c"
+				RelativePath="..\..\libsndfile\src\double64.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\dwd.c"
+				RelativePath="..\..\libsndfile\src\dwd.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\dwvw.c"
+				RelativePath="..\..\libsndfile\src\dwvw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\file_io.c"
+				RelativePath="..\..\libsndfile\src\file_io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\flac.c"
+				RelativePath="..\..\libsndfile\src\flac.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\float32.c"
+				RelativePath="..\..\libsndfile\src\float32.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\g72x.c"
+				RelativePath="..\..\libsndfile\src\g72x.c"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -235,174 +235,174 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\gsm610.c"
+				RelativePath="..\..\libsndfile\src\gsm610.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\htk.c"
+				RelativePath="..\..\libsndfile\src\htk.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\ima_adpcm.c"
+				RelativePath="..\..\libsndfile\src\ima_adpcm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\ircam.c"
+				RelativePath="..\..\libsndfile\src\ircam.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\mat4.c"
+				RelativePath="..\..\libsndfile\src\mat4.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\mat5.c"
+				RelativePath="..\..\libsndfile\src\mat5.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\ms_adpcm.c"
+				RelativePath="..\..\libsndfile\src\ms_adpcm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\nist.c"
+				RelativePath="..\..\libsndfile\src\nist.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\ogg.c"
+				RelativePath="..\..\libsndfile\src\ogg.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\paf.c"
+				RelativePath="..\..\libsndfile\src\paf.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\pcm.c"
+				RelativePath="..\..\libsndfile\src\pcm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\pvf.c"
+				RelativePath="..\..\libsndfile\src\pvf.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\raw.c"
+				RelativePath="..\..\libsndfile\src\raw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\rx2.c"
+				RelativePath="..\..\libsndfile\src\rx2.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\sd2.c"
+				RelativePath="..\..\libsndfile\src\sd2.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\sds.c"
+				RelativePath="..\..\libsndfile\src\sds.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\sndfile.c"
+				RelativePath="..\..\libsndfile\src\sndfile.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\strings.c"
+				RelativePath="..\..\libsndfile\src\strings.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\svx.c"
+				RelativePath="..\..\libsndfile\src\svx.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\txw.c"
+				RelativePath="..\..\libsndfile\src\txw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\ulaw.c"
+				RelativePath="..\..\libsndfile\src\ulaw.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\voc.c"
+				RelativePath="..\..\libsndfile\src\voc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\vox_adpcm.c"
+				RelativePath="..\..\libsndfile\src\vox_adpcm.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\w64.c"
+				RelativePath="..\..\libsndfile\src\w64.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\wav.c"
+				RelativePath="..\..\libsndfile\src\wav.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\wav_w64.c"
+				RelativePath="..\..\libsndfile\src\wav_w64.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\wve.c"
+				RelativePath="..\..\libsndfile\src\wve.c"
 				>
 			</File>
 			<File
-				RelativePath="..\..\libsndfile-1.0.16\src\xi.c"
+				RelativePath="..\..\libsndfile\src\xi.c"
 				>
 			</File>
 			<Filter
 				Name="GSM Sources"
 				>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\add.c"
+					RelativePath="..\..\libsndfile\src\GSM610\add.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\code.c"
+					RelativePath="..\..\libsndfile\src\GSM610\code.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\decode.c"
+					RelativePath="..\..\libsndfile\src\GSM610\decode.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_create.c"
+					RelativePath="..\..\libsndfile\src\GSM610\gsm_create.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_decode.c"
+					RelativePath="..\..\libsndfile\src\GSM610\gsm_decode.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_destroy.c"
+					RelativePath="..\..\libsndfile\src\GSM610\gsm_destroy.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_encode.c"
+					RelativePath="..\..\libsndfile\src\GSM610\gsm_encode.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_option.c"
+					RelativePath="..\..\libsndfile\src\GSM610\gsm_option.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\long_term.c"
+					RelativePath="..\..\libsndfile\src\GSM610\long_term.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\lpc.c"
+					RelativePath="..\..\libsndfile\src\GSM610\lpc.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\preprocess.c"
+					RelativePath="..\..\libsndfile\src\GSM610\preprocess.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\rpe.c"
+					RelativePath="..\..\libsndfile\src\GSM610\rpe.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\short_term.c"
+					RelativePath="..\..\libsndfile\src\GSM610\short_term.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\GSM610\table.c"
+					RelativePath="..\..\libsndfile\src\GSM610\table.c"
 					>
 				</File>
 			</Filter>
@@ -410,23 +410,23 @@
 				Name="G72X Sources"
 				>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\G72x\g721.c"
+					RelativePath="..\..\libsndfile\src\G72x\g721.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_16.c"
+					RelativePath="..\..\libsndfile\src\G72x\g723_16.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_24.c"
+					RelativePath="..\..\libsndfile\src\G72x\g723_24.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_40.c"
+					RelativePath="..\..\libsndfile\src\G72x\g723_40.c"
 					>
 				</File>
 				<File
-					RelativePath="..\..\libsndfile-1.0.16\src\G72x\g72x.c"
+					RelativePath="..\..\libsndfile\src\G72x\g72x.c"
 					>
 				</File>
 			</Filter>