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

diff --git a/Freeswitch.sln b/Freeswitch.sln
index 5a215c5a6b7c67964642fdb24af4581609326c7d..17b104432ee474ea02645e893f8a7edd3465fdbd 100644 (file)
--- 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}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download LIBSNDFILE", "libs\win32\Download LIBSNDFILE.vcproj", "{EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}\r
-       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curllib", "libs\win32\curl\curllib.vcproj", "{87EE9DA4-DE1E-4448-8324-183C98DCA588}"\r
 EndProject\r
@@ -790,10 +785,6 @@ Global
                {49C34584-B6DA-448F-83CF-27584DC9FC90}.Debug|Win32.Build.0 = Debug|Win32\r
                {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.ActiveCfg = Release|Win32\r
                {49C34584-B6DA-448F-83CF-27584DC9FC90}.Release|Win32.Build.0 = Release|Win32\r
-               {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Debug|Win32.Build.0 = Debug|Win32\r
-               {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Release|Win32.ActiveCfg = Release|Win32\r
-               {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5}.Release|Win32.Build.0 = Release|Win32\r
                {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Debug|Win32.Build.0 = Debug|Win32\r
                {3D0370CA-BED2-4657-A475-32375CBCB6E4}.Release|Win32.ActiveCfg = Release|Win32\r
@@ -993,7 +984,6 @@ Global
                {AB91A099-7690-4ECF-8994-E458F4EA1ED4} = {F69A4A6B-9360-4EBB-A280-22AA3C455AC5}\r
                {985135DA-BBE1-42D2-8A85-1F7DF0609B3D} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {5927104D-C14C-4AC8-925C-4AB681762E75} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
-               {EFA9E76E-62A5-4237-B7E9-F39B8E174CD5} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {EC8D4AE8-0F3E-454A-BFB8-D56A5D9C0121} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {8B2CE7D1-77EF-45ED-927D-82147805440B} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r

diff --git a/libs/win32/libsndfile/libsndfile.vcproj b/libs/win32/libsndfile/libsndfile.vcproj
index 133a4d8a726026c2390847f2cb3313e8eee860d2..7d24c2bce9e8e00fc73d38898c733236aaced9a1 100644 (file)
--- a/libs/win32/libsndfile/libsndfile.vcproj
+++ b/libs/win32/libsndfile/libsndfile.vcproj
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"\r
                                UseUnicodeResponseFiles="true"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\libsndfile-1.0.16\src;."\r
+                               AdditionalIncludeDirectories="..\..\libsndfile\src;."\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -106,7 +106,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                UseUnicodeResponseFiles="true"\r
-                               AdditionalIncludeDirectories="..\..\libsndfile-1.0.16\src;."\r
+                               AdditionalIncludeDirectories="..\..\libsndfile\src;."\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
@@ -153,31 +153,31 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\aiff.c"\r
+                               RelativePath="..\..\libsndfile\src\aiff.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\alaw.c"\r
+                               RelativePath="..\..\libsndfile\src\alaw.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\au.c"\r
+                               RelativePath="..\..\libsndfile\src\au.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\avr.c"\r
+                               RelativePath="..\..\libsndfile\src\avr.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\broadcast.c"\r
+                               RelativePath="..\..\libsndfile\src\broadcast.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\caf.c"\r
+                               RelativePath="..\..\libsndfile\src\caf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\command.c"\r
+                               RelativePath="..\..\libsndfile\src\command.c"\r
                                >\r
                        </File>\r
                        <File\r
@@ -185,35 +185,35 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\dither.c"\r
+                               RelativePath="..\..\libsndfile\src\dither.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\double64.c"\r
+                               RelativePath="..\..\libsndfile\src\double64.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\dwd.c"\r
+                               RelativePath="..\..\libsndfile\src\dwd.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\dwvw.c"\r
+                               RelativePath="..\..\libsndfile\src\dwvw.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\file_io.c"\r
+                               RelativePath="..\..\libsndfile\src\file_io.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\flac.c"\r
+                               RelativePath="..\..\libsndfile\src\flac.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\float32.c"\r
+                               RelativePath="..\..\libsndfile\src\float32.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\g72x.c"\r
+                               RelativePath="..\..\libsndfile\src\g72x.c"\r
                                >\r
                                <FileConfiguration\r
                                        Name="Debug|Win32"\r
@@ -235,174 +235,174 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\gsm610.c"\r
+                               RelativePath="..\..\libsndfile\src\gsm610.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\htk.c"\r
+                               RelativePath="..\..\libsndfile\src\htk.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\ima_adpcm.c"\r
+                               RelativePath="..\..\libsndfile\src\ima_adpcm.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\ircam.c"\r
+                               RelativePath="..\..\libsndfile\src\ircam.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\mat4.c"\r
+                               RelativePath="..\..\libsndfile\src\mat4.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\mat5.c"\r
+                               RelativePath="..\..\libsndfile\src\mat5.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\ms_adpcm.c"\r
+                               RelativePath="..\..\libsndfile\src\ms_adpcm.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\nist.c"\r
+                               RelativePath="..\..\libsndfile\src\nist.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\ogg.c"\r
+                               RelativePath="..\..\libsndfile\src\ogg.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\paf.c"\r
+                               RelativePath="..\..\libsndfile\src\paf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\pcm.c"\r
+                               RelativePath="..\..\libsndfile\src\pcm.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\pvf.c"\r
+                               RelativePath="..\..\libsndfile\src\pvf.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\raw.c"\r
+                               RelativePath="..\..\libsndfile\src\raw.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\rx2.c"\r
+                               RelativePath="..\..\libsndfile\src\rx2.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\sd2.c"\r
+                               RelativePath="..\..\libsndfile\src\sd2.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\sds.c"\r
+                               RelativePath="..\..\libsndfile\src\sds.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\sndfile.c"\r
+                               RelativePath="..\..\libsndfile\src\sndfile.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\strings.c"\r
+                               RelativePath="..\..\libsndfile\src\strings.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\svx.c"\r
+                               RelativePath="..\..\libsndfile\src\svx.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\txw.c"\r
+                               RelativePath="..\..\libsndfile\src\txw.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\ulaw.c"\r
+                               RelativePath="..\..\libsndfile\src\ulaw.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\voc.c"\r
+                               RelativePath="..\..\libsndfile\src\voc.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\vox_adpcm.c"\r
+                               RelativePath="..\..\libsndfile\src\vox_adpcm.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\w64.c"\r
+                               RelativePath="..\..\libsndfile\src\w64.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\wav.c"\r
+                               RelativePath="..\..\libsndfile\src\wav.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\wav_w64.c"\r
+                               RelativePath="..\..\libsndfile\src\wav_w64.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\wve.c"\r
+                               RelativePath="..\..\libsndfile\src\wve.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\libsndfile-1.0.16\src\xi.c"\r
+                               RelativePath="..\..\libsndfile\src\xi.c"\r
                                >\r
                        </File>\r
                        <Filter\r
                                Name="GSM Sources"\r
                                >\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\add.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\add.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\code.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\code.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\decode.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\decode.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_create.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\gsm_create.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_decode.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\gsm_decode.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_destroy.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\gsm_destroy.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_encode.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\gsm_encode.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\gsm_option.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\gsm_option.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\long_term.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\long_term.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\lpc.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\lpc.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\preprocess.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\preprocess.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\rpe.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\rpe.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\short_term.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\short_term.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\GSM610\table.c"\r
+                                       RelativePath="..\..\libsndfile\src\GSM610\table.c"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -410,23 +410,23 @@
                                Name="G72X Sources"\r
                                >\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\G72x\g721.c"\r
+                                       RelativePath="..\..\libsndfile\src\G72x\g721.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_16.c"\r
+                                       RelativePath="..\..\libsndfile\src\G72x\g723_16.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_24.c"\r
+                                       RelativePath="..\..\libsndfile\src\G72x\g723_24.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\G72x\g723_40.c"\r
+                                       RelativePath="..\..\libsndfile\src\G72x\g723_40.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\libsndfile-1.0.16\src\G72x\g72x.c"\r
+                                       RelativePath="..\..\libsndfile\src\G72x\g72x.c"\r
                                        >\r
                                </File>\r
                        </Filter>\r