shithub: sox

Download patch

ref: 998f125c59d520e635fcac67f95389db719ac0be
parent: 9c17c159854fb442b7db21fda55bba156fedc8dc
author: Mans Rullgard <mans@mansr.com>
date: Tue Aug 11 11:34:28 EDT 2020

build: delete msvc project files

The msvc project files are for ancient versions and don't work any more.
Delete them.

diff: cannot open a/msvc10/Mad//null: file does not exist: 'a/msvc10/Mad//null' diff: cannot open a/msvc10/Mp3Lame//null: file does not exist: 'a/msvc10/Mp3Lame//null' diff: cannot open a/msvc10/Png//null: file does not exist: 'a/msvc10/Png//null' diff: cannot open a/msvc10/SndFile/sys//null: file does not exist: 'a/msvc10/SndFile/sys//null' diff: cannot open a/msvc10/SndFile//null: file does not exist: 'a/msvc10/SndFile//null' diff: cannot open a/msvc10/SoX//null: file does not exist: 'a/msvc10/SoX//null' diff: cannot open a/msvc10//null: file does not exist: 'a/msvc10//null' diff: cannot open a/msvc9/Mad//null: file does not exist: 'a/msvc9/Mad//null' diff: cannot open a/msvc9/Mp3Lame//null: file does not exist: 'a/msvc9/Mp3Lame//null' diff: cannot open a/msvc9/Png//null: file does not exist: 'a/msvc9/Png//null' diff: cannot open a/msvc9/SndFile/sys//null: file does not exist: 'a/msvc9/SndFile/sys//null' diff: cannot open a/msvc9/SndFile//null: file does not exist: 'a/msvc9/SndFile//null' diff: cannot open a/msvc9/Sox//null: file does not exist: 'a/msvc9/Sox//null' diff: cannot open a/msvc9//null: file does not exist: 'a/msvc9//null'
--- a/INSTALL
+++ b/INSTALL
@@ -202,110 +202,3 @@
 If you're adding new features to SoX or want to perform advance tests
 on a new platform then you can use the scripts "tests.sh" and
 "testall.sh" to stress SoX.
-
-
-
-Compiling using Microsoft's Visual C
-------------------------------------
-
-To compile a full-featured build of SoX with Visual Studio 2008 (msvc9),
-Visual Studio 2010 (msvc10), or the Windows SDK 7.1, you may be able to use the
-preconfigured solution found in the sox\msvc9 (VS2008) or sox\msvc10 (VS2010 or
-Windows SDK 7.1) folder. See sox\msvc9\readme.txt or sox\msvc10\readme.txt for
-details on building using the corresponding Microsoft C compiler.
-
-
-
-Appendix: How To Compile SoX with MP3 Support on Win32
-------------------------------------------------------
-
-The solution files in msvc9 and msvc10 will build SoX to dynamically load
-libmad.dll and libmp3lame.dll at runtime.
-
-The following text, untested by the SoX team, was originally written
-by `Enter AG' and released to the public domain. It includes instructions for
-building SoX with MP3 support linked directly into the SoX executable.
-
-= How To Compile Sox with MP3 Support =
-
-== Requirements ==
-
-The following requirements have been tested. Nevertheless, other
-versions may work as well.
-
-o Microsoft Windows (Win32, Win2000, XP, Win2003, Vista, etc.).
-
-o Microsoft Visual Stuio 2008 (earlier versions should also work).
-
-o SoX source distribution version 14.0.1
-  available on [http://sox.sourceforge.net]
-
-o LAME source distribution version 3.97. LAME 3.98 is required for full ID3 tag 
-  support. Available on [http://lame.sourceforge.net]
-
-o MAD source distribution version 0.15.1b
-  available on [http://www.underbit.com/products/mad/]
-
-== Compilation Procedure ==
-
-=== Compilation of the LAME libraries ===
-
-o Extract the LAME source distribution and open it as a Visual Studio project
-  using the VS file in the top directory.
-
-o Set the ''libmp3lame'' "Configuration Properties -> C/C++ -> Code Generation
-  -> Runtime Library" to Multi-threaded DLL (/MD).
-
-o Do the same for ''mpglib'' .
-
-o Build ''libmp3lame'' and ''mpglib.''
-
-o Rename the static library libmp3lame.lib to mp3lame.lib.
-
-o Create a folder somewhere with an arbitrary name. We used the name
-  "lameforsox". Create in this folder a new folder called "lame" and copy the
-  lame.h header file into it. Copy mp3lame.lib and mpglib.lib in the lameforsox
-  folder. Now you should have prepared the lame components for further use like
-  this:
-	...\[somewhere]\lameforsox\
-		mp3lame.lib
-		mpglib.lib
-			\lame\
-				lame.h
-
-=== Compilation of the MAD library ===
-
-o Compile ''libmad'' with the same "Runtime Library" settings as described for
-  LAME (previous section Compilation of the LAME libraries).
-
-o Rename the static library libmad.lib to mad.lib.
-
-=== Compilation of SoX with the LAME and MAD libraries ===
-
-o Open Visual Studio and add in "Tools -> Options -> Projects and Solutions ->
-  VC++ Directories" in the "Include Directories" collection the folder
-  containing the MAD header file mad.h and the folder containing lame/lame.h
-  (...\[somewhere]\lameforsox).  Add in the "Library files" collection the
-  folder containing mad.lib and the folder containing the lame libraries
-  mp3lame.lib and mpglib.lib (...\[somewhere]\lameforsox).
-
-o Open Visual Studio and open the SoX solution file in the SoX top directory
-  (sox.sln).
-
-o Rebuild "ALL_BUILD" and confirm all "File Modification Detected" dialogs
-  with "Reload".
-
-o Add in the libsox "Preprocessor Definitions" (right click on libsox ->
-  Properties -> Configuration Properties -> C/C++ -> Preprocessor) HAVE_STRING_H
-  before the first line.  Set the "Runtime Library" to Multi-threaded DLL (/MD)
-  as described above.
-
-o Do the same for sox and add in the "Additional Dependencies" (Linker -> Input)
-  after the last line mpglib.lib.
-
-o Now build libsox
-
-o and then sox.
-
-o Sox now prompts "mp3, mp2" in the usage output in the section "SUPPORTED FILE
-  FORMATS".
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = lpc10 libgsm src
-DIST_SUBDIRS = lpc10 libgsm src msvc9 msvc10
+DIST_SUBDIRS = lpc10 libgsm src
 
 RM = rm -f
 
--- a/configure.ac
+++ b/configure.ac
@@ -665,7 +665,7 @@
 AM_CONDITIONAL(STATIC_LIBSOX_ONLY, test "$enable_shared" = "no" -a "$enable_static" = "yes")
 
 dnl Generate output files.
-AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile msvc9/Makefile msvc10/Makefile sox.pc)
+AC_CONFIG_FILES(Makefile src/Makefile libgsm/Makefile lpc10/Makefile sox.pc)
 AC_OUTPUT
 
 if test "$using_gsm" != "no"; then
--- a/msvc10/.gitignore
+++ /dev/null
@@ -1,10 +1,0 @@
-*.user
-Debug
-ipch
-Makefile
-Makefile.in
-Release
-Sox.ncb
-Sox.opensdf
-Sox.sdf
-*.suo
--- a/msvc10/LibFlac.vcxproj
+++ /dev/null
@@ -1,131 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}</ProjectGuid>
-    <RootNamespace>LibFlac</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../flac/src/libFLAC/include;../../flac/include;../../libogg/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__USE_3DNOW;VERSION="1.2.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../flac/src/libFLAC/include;../../flac/include;../../libogg/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__USE_3DNOW;VERSION="1.2.0";FLAC__NO_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\flac\src\libFLAC\bitmath.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\bitreader.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\bitwriter.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\cpu.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\crc.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\fixed.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\float.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\format.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\lpc.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\md5.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\memory.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\metadata_iterators.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\metadata_object.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\ogg_decoder_aspect.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\ogg_encoder_aspect.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\ogg_helper.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\ogg_mapping.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\stream_decoder.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\stream_encoder.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\stream_encoder_framing.c" />
-    <ClCompile Include="..\..\flac\src\libFLAC\window.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\flac\include\FLAC\all.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\assert.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\callback.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\export.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\format.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\metadata.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\ordinals.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\stream_decoder.h" />
-    <ClInclude Include="..\..\flac\include\FLAC\stream_encoder.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibGsm.vcxproj
+++ /dev/null
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BEE9F57C-384E-4C99-87EB-629BF45C8A89}</ProjectGuid>
-    <RootNamespace>LibGsm</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;LTP_CUT;FAST;USE_FLOAT_MUL;WAV49;SASR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4101;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;LTP_CUT;FAST;USE_FLOAT_MUL;WAV49;SASR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4101;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\libgsm\add.c" />
-    <ClCompile Include="..\libgsm\code.c" />
-    <ClCompile Include="..\libgsm\decode.c" />
-    <ClCompile Include="..\libgsm\gsm_create.c" />
-    <ClCompile Include="..\libgsm\gsm_decode.c" />
-    <ClCompile Include="..\libgsm\gsm_destroy.c" />
-    <ClCompile Include="..\libgsm\gsm_encode.c" />
-    <ClCompile Include="..\libgsm\gsm_option.c" />
-    <ClCompile Include="..\libgsm\long_term.c" />
-    <ClCompile Include="..\libgsm\lpc.c" />
-    <ClCompile Include="..\libgsm\preprocess.c" />
-    <ClCompile Include="..\libgsm\rpe.c" />
-    <ClCompile Include="..\libgsm\short_term.c" />
-    <ClCompile Include="..\libgsm\table.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\libgsm\aliases.h" />
-    <ClInclude Include="..\libgsm\gsm.h" />
-    <ClInclude Include="..\libgsm\private.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibId3Tag.vcxproj
+++ /dev/null
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{40EA92B6-38AA-4E67-894D-92C37C946402}</ProjectGuid>
-    <RootNamespace>LibId3Tag</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../libid3tag/msvc++;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4013;4018;4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../libid3tag/msvc++;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4013;4018;4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libid3tag\compat.c" />
-    <ClCompile Include="..\..\libid3tag\crc.c" />
-    <ClCompile Include="..\..\libid3tag\debug.c" />
-    <ClCompile Include="..\..\libid3tag\field.c" />
-    <ClCompile Include="..\..\libid3tag\file.c" />
-    <ClCompile Include="..\..\libid3tag\frame.c" />
-    <ClCompile Include="..\..\libid3tag\frametype.c" />
-    <ClCompile Include="..\..\libid3tag\genre.c" />
-    <ClCompile Include="..\..\libid3tag\latin1.c" />
-    <ClCompile Include="..\..\libid3tag\parse.c" />
-    <ClCompile Include="..\..\libid3tag\render.c" />
-    <ClCompile Include="..\..\libid3tag\tag.c" />
-    <ClCompile Include="..\..\libid3tag\ucs4.c" />
-    <ClCompile Include="..\..\libid3tag\utf16.c" />
-    <ClCompile Include="..\..\libid3tag\utf8.c" />
-    <ClCompile Include="..\..\libid3tag\util.c" />
-    <ClCompile Include="..\..\libid3tag\version.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libid3tag\compat.h" />
-    <ClInclude Include="..\..\libid3tag\crc.h" />
-    <ClInclude Include="..\..\libid3tag\debug.h" />
-    <ClInclude Include="..\..\libid3tag\field.h" />
-    <ClInclude Include="..\..\libid3tag\file.h" />
-    <ClInclude Include="..\..\libid3tag\frame.h" />
-    <ClInclude Include="..\..\libid3tag\frametype.h" />
-    <ClInclude Include="..\..\libid3tag\genre.h" />
-    <ClInclude Include="..\..\libid3tag\global.h" />
-    <ClInclude Include="..\..\libid3tag\id3tag.h" />
-    <ClInclude Include="..\..\libid3tag\latin1.h" />
-    <ClInclude Include="..\..\libid3tag\parse.h" />
-    <ClInclude Include="..\..\libid3tag\render.h" />
-    <ClInclude Include="..\..\libid3tag\tag.h" />
-    <ClInclude Include="..\..\libid3tag\ucs4.h" />
-    <ClInclude Include="..\..\libid3tag\utf16.h" />
-    <ClInclude Include="..\..\libid3tag\utf8.h" />
-    <ClInclude Include="..\..\libid3tag\util.h" />
-    <ClInclude Include="..\..\libid3tag\version.h" />
-    <ClInclude Include="..\..\libid3tag\msvc++\config.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibLpc10.vcxproj
+++ /dev/null
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}</ProjectGuid>
-    <RootNamespace>LibLpc10</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>SoX;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4146;4244;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>SoX;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4146;4244;4723;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\lpc10\analys.c" />
-    <ClCompile Include="..\lpc10\bsynz.c" />
-    <ClCompile Include="..\lpc10\chanwr.c" />
-    <ClCompile Include="..\lpc10\dcbias.c" />
-    <ClCompile Include="..\lpc10\decode.c" />
-    <ClCompile Include="..\lpc10\deemp.c" />
-    <ClCompile Include="..\lpc10\difmag.c" />
-    <ClCompile Include="..\lpc10\dyptrk.c" />
-    <ClCompile Include="..\lpc10\encode.c" />
-    <ClCompile Include="..\lpc10\energy.c" />
-    <ClCompile Include="..\lpc10\f2clib.c" />
-    <ClCompile Include="..\lpc10\ham84.c" />
-    <ClCompile Include="..\lpc10\hp100.c" />
-    <ClCompile Include="..\lpc10\invert.c" />
-    <ClCompile Include="..\lpc10\irc2pc.c" />
-    <ClCompile Include="..\lpc10\ivfilt.c" />
-    <ClCompile Include="..\lpc10\lpcdec.c" />
-    <ClCompile Include="..\lpc10\lpcenc.c" />
-    <ClCompile Include="..\lpc10\lpcini.c" />
-    <ClCompile Include="..\lpc10\lpfilt.c" />
-    <ClCompile Include="..\lpc10\median.c" />
-    <ClCompile Include="..\lpc10\mload.c" />
-    <ClCompile Include="..\lpc10\onset.c" />
-    <ClCompile Include="..\lpc10\pitsyn.c" />
-    <ClCompile Include="..\lpc10\placea.c" />
-    <ClCompile Include="..\lpc10\placev.c" />
-    <ClCompile Include="..\lpc10\preemp.c" />
-    <ClCompile Include="..\lpc10\prepro.c" />
-    <ClCompile Include="..\lpc10\random.c" />
-    <ClCompile Include="..\lpc10\rcchk.c" />
-    <ClCompile Include="..\lpc10\synths.c" />
-    <ClCompile Include="..\lpc10\tbdm.c" />
-    <ClCompile Include="..\lpc10\voicin.c" />
-    <ClCompile Include="..\lpc10\vparms.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\lpc10\f2c.h" />
-    <ClInclude Include="..\lpc10\lpc10.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/msvc10/LibMad.vcxproj
+++ /dev/null
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}</ProjectGuid>
-    <RootNamespace>LibMad</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>Mad;../../libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4018;4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>Mad/LibMad.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SetChecksum>true</SetChecksum>
-      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>Mad;../../libmad;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4018;4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>Mad/LibMad.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libmad\bit.c" />
-    <ClCompile Include="..\..\libmad\decoder.c" />
-    <ClCompile Include="..\..\libmad\fixed.c" />
-    <ClCompile Include="..\..\libmad\frame.c" />
-    <ClCompile Include="..\..\libmad\huffman.c" />
-    <ClCompile Include="..\..\libmad\layer12.c" />
-    <ClCompile Include="..\..\libmad\layer3.c" />
-    <ClCompile Include="..\..\libmad\stream.c" />
-    <ClCompile Include="..\..\libmad\synth.c" />
-    <ClCompile Include="..\..\libmad\timer.c" />
-    <ClCompile Include="..\..\libmad\version.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Mad\LibMad.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libmad\bit.h" />
-    <ClInclude Include="..\..\libmad\decoder.h" />
-    <ClInclude Include="..\..\libmad\fixed.h" />
-    <ClInclude Include="..\..\libmad\frame.h" />
-    <ClInclude Include="..\..\libmad\global.h" />
-    <ClInclude Include="..\..\libmad\huffman.h" />
-    <ClInclude Include="..\..\libmad\layer12.h" />
-    <ClInclude Include="..\..\libmad\layer3.h" />
-    <ClInclude Include="..\..\libmad\mad.h" />
-    <ClInclude Include="..\..\libmad\stream.h" />
-    <ClInclude Include="..\..\libmad\synth.h" />
-    <ClInclude Include="..\..\libmad\timer.h" />
-    <ClInclude Include="..\..\libmad\version.h" />
-    <ClInclude Include="Mad\config.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibMp3Lame.vcxproj
+++ /dev/null
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4DFD6FD1-96F1-434A-AC69-01783B876354}</ProjectGuid>
-    <RootNamespace>LibMp3Lame</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>Mp3Lame;../../lame;../../lame/include;../../lame/libmp3lame;../../lame/mpglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\lame\include\lame.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SetChecksum>true</SetChecksum>
-      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>Mp3Lame;../../lame;../../lame/include;../../lame/libmp3lame;../../lame/mpglib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).dll</OutputFile>
-      <ModuleDefinitionFile>..\..\lame\include\lame.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\lame\libmp3lame\bitstream.c" />
-    <ClCompile Include="..\..\lame\mpglib\common.c" />
-    <ClCompile Include="..\..\lame\mpglib\dct64_i386.c" />
-    <ClCompile Include="..\..\lame\mpglib\decode_i386.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\encoder.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\fft.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\gain_analysis.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\id3tag.c" />
-    <ClCompile Include="..\..\lame\mpglib\interface.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\lame.c" />
-    <ClCompile Include="..\..\lame\mpglib\layer1.c" />
-    <ClCompile Include="..\..\lame\mpglib\layer2.c" />
-    <ClCompile Include="..\..\lame\mpglib\layer3.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\mpglib_interface.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\newmdct.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\presets.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\psymodel.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\quantize.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\quantize_pvt.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\reservoir.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\set_get.c" />
-    <ClCompile Include="..\..\lame\mpglib\tabinit.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\tables.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\takehiro.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\util.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\vbrquantize.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\VbrTag.c" />
-    <ClCompile Include="..\..\lame\libmp3lame\version.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\lame\include\lame.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\lame\libmp3lame\bitstream.h" />
-    <ClInclude Include="..\..\lame\mpglib\common.h" />
-    <ClInclude Include="..\..\lame\configMS.h" />
-    <ClInclude Include="..\..\lame\mpglib\dct64_i386.h" />
-    <ClInclude Include="..\..\lame\mpglib\decode_i386.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\encoder.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\fft.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\gain_analysis.h" />
-    <ClInclude Include="..\..\lame\mpglib\huffman.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\id3tag.h" />
-    <ClInclude Include="..\..\lame\mpglib\interface.h" />
-    <ClInclude Include="..\..\lame\mpglib\l2tables.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\l3side.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\lame-analysis.h" />
-    <ClInclude Include="..\..\lame\include\lame.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\lame_global_flags.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\lameerror.h" />
-    <ClInclude Include="..\..\lame\mpglib\layer1.h" />
-    <ClInclude Include="..\..\lame\mpglib\layer2.h" />
-    <ClInclude Include="..\..\lame\mpglib\layer3.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\machine.h" />
-    <ClInclude Include="..\..\lame\mpglib\mpg123.h" />
-    <ClInclude Include="..\..\lame\mpglib\mpglib.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\newmdct.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\psymodel.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\quantize.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\quantize_pvt.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\reservoir.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\set_get.h" />
-    <ClInclude Include="..\..\lame\mpglib\tabinit.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\tables.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\util.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\vbrquantize.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\VbrTag.h" />
-    <ClInclude Include="..\..\lame\libmp3lame\version.h" />
-    <ClInclude Include="Mp3Lame\config.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibOgg.vcxproj
+++ /dev/null
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C5C229AC-316D-42CB-9CA3-329619618972}</ProjectGuid>
-    <RootNamespace>LibOgg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../libogg/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../libogg/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libogg\src\bitwise.c" />
-    <ClCompile Include="..\..\libogg\src\framing.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libogg\include\ogg\ogg.h" />
-    <ClInclude Include="..\..\libogg\include\ogg\os_types.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibPng.vcxproj
+++ /dev/null
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{46E7AC9D-3E96-4B34-B493-501BC277D6F9}</ProjectGuid>
-    <RootNamespace>LibPng</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>Png;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>Png;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libpng\png.c" />
-    <ClCompile Include="..\..\libpng\pngerror.c" />
-    <ClCompile Include="..\..\libpng\pngget.c" />
-    <ClCompile Include="..\..\libpng\pngmem.c" />
-    <ClCompile Include="..\..\libpng\pngpread.c" />
-    <ClCompile Include="..\..\libpng\pngread.c" />
-    <ClCompile Include="..\..\libpng\pngrio.c" />
-    <ClCompile Include="..\..\libpng\pngrtran.c" />
-    <ClCompile Include="..\..\libpng\pngrutil.c" />
-    <ClCompile Include="..\..\libpng\pngset.c" />
-    <ClCompile Include="..\..\libpng\pngtrans.c" />
-    <ClCompile Include="..\..\libpng\pngwio.c" />
-    <ClCompile Include="..\..\libpng\pngwrite.c" />
-    <ClCompile Include="..\..\libpng\pngwtran.c" />
-    <ClCompile Include="..\..\libpng\pngwutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libpng\png.h" />
-    <ClInclude Include="..\..\libpng\pngconf.h" />
-    <ClInclude Include="Png\inttypes.h" />
-    <ClInclude Include="Png\pnglibconf.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibSndFile.vcxproj
+++ /dev/null
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{342BDA83-C83F-4168-8425-E1DF72F47018}</ProjectGuid>
-    <RootNamespace>LibSndFile</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LibSndFile-1</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LibSndFile-1</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>SndFile;..\..\libsndfile\src;../../flac/include;../../libogg/include;../../libvorbis/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSNDFILE_EXPORTS;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>..\..\libsndfile\src\libsndfile-1.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SetChecksum>true</SetChecksum>
-      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>SndFile;..\..\libsndfile\src;../../flac/include;../../libogg/include;../../libvorbis/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSNDFILE_EXPORTS;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>..\..\libsndfile\src\libsndfile-1.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libsndfile\src\aiff.c" />
-    <ClCompile Include="..\..\libsndfile\src\alaw.c" />
-    <ClCompile Include="..\..\libsndfile\src\au.c" />
-    <ClCompile Include="..\..\libsndfile\src\audio_detect.c" />
-    <ClCompile Include="..\..\libsndfile\src\avr.c" />
-    <ClCompile Include="..\..\libsndfile\src\broadcast.c" />
-    <ClCompile Include="..\..\libsndfile\src\caf.c" />
-    <ClCompile Include="..\..\libsndfile\src\chanmap.c" />
-    <ClCompile Include="..\..\libsndfile\src\chunk.c" />
-    <ClCompile Include="..\..\libsndfile\src\command.c" />
-    <ClCompile Include="..\..\libsndfile\src\common.c" />
-    <ClCompile Include="..\..\libsndfile\src\dither.c" />
-    <ClCompile Include="..\..\libsndfile\src\double64.c" />
-    <ClCompile Include="..\..\libsndfile\src\dwd.c" />
-    <ClCompile Include="..\..\libsndfile\src\dwvw.c" />
-    <ClCompile Include="..\..\libsndfile\src\file_io.c" />
-    <ClCompile Include="..\..\libsndfile\src\flac.c" />
-    <ClCompile Include="..\..\libsndfile\src\float32.c" />
-    <ClCompile Include="..\..\libsndfile\src\g72x.c" />
-    <ClCompile Include="..\..\libsndfile\src\gsm610.c" />
-    <ClCompile Include="..\..\libsndfile\src\htk.c" />
-    <ClCompile Include="..\..\libsndfile\src\id3.c" />
-    <ClCompile Include="..\..\libsndfile\src\ima_adpcm.c" />
-    <ClCompile Include="..\..\libsndfile\src\ima_oki_adpcm.c" />
-    <ClCompile Include="..\..\libsndfile\src\interleave.c" />
-    <ClCompile Include="..\..\libsndfile\src\ircam.c" />
-    <ClCompile Include="..\..\libsndfile\src\macbinary3.c" />
-    <ClCompile Include="..\..\libsndfile\src\macos.c" />
-    <ClCompile Include="..\..\libsndfile\src\mat4.c" />
-    <ClCompile Include="..\..\libsndfile\src\mat5.c" />
-    <ClCompile Include="..\..\libsndfile\src\mpc2k.c" />
-    <ClCompile Include="..\..\libsndfile\src\ms_adpcm.c" />
-    <ClCompile Include="..\..\libsndfile\src\nist.c" />
-    <ClCompile Include="..\..\libsndfile\src\ogg.c" />
-    <ClCompile Include="..\..\libsndfile\src\ogg_pcm.c" />
-    <ClCompile Include="..\..\libsndfile\src\ogg_speex.c" />
-    <ClCompile Include="..\..\libsndfile\src\ogg_vorbis.c" />
-    <ClCompile Include="..\..\libsndfile\src\paf.c" />
-    <ClCompile Include="..\..\libsndfile\src\pcm.c" />
-    <ClCompile Include="..\..\libsndfile\src\pvf.c" />
-    <ClCompile Include="..\..\libsndfile\src\raw.c" />
-    <ClCompile Include="..\..\libsndfile\src\rf64.c" />
-    <ClCompile Include="..\..\libsndfile\src\rx2.c" />
-    <ClCompile Include="..\..\libsndfile\src\sd2.c" />
-    <ClCompile Include="..\..\libsndfile\src\sds.c" />
-    <ClCompile Include="..\..\libsndfile\src\sndfile.c" />
-    <ClCompile Include="..\..\libsndfile\src\strings.c" />
-    <ClCompile Include="..\..\libsndfile\src\svx.c" />
-    <ClCompile Include="..\..\libsndfile\src\txw.c" />
-    <ClCompile Include="..\..\libsndfile\src\ulaw.c" />
-    <ClCompile Include="..\..\libsndfile\src\voc.c" />
-    <ClCompile Include="..\..\libsndfile\src\vox_adpcm.c" />
-    <ClCompile Include="..\..\libsndfile\src\w64.c" />
-    <ClCompile Include="..\..\libsndfile\src\wav.c" />
-    <ClCompile Include="..\..\libsndfile\src\wav_w64.c" />
-    <ClCompile Include="..\..\libsndfile\src\windows.c" />
-    <ClCompile Include="..\..\libsndfile\src\wve.c" />
-    <ClCompile Include="..\..\libsndfile\src\xi.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libsndfile\src\common.h" />
-    <ClInclude Include="..\..\libsndfile\src\GSM610\config.h" />
-    <ClInclude Include="..\..\libsndfile\src\G72x\g72x.h" />
-    <ClInclude Include="..\..\libsndfile\src\G72x\g72x_priv.h" />
-    <ClInclude Include="..\..\libsndfile\src\GSM610\gsm.h" />
-    <ClInclude Include="..\..\libsndfile\src\GSM610\gsm610_priv.h" />
-    <ClInclude Include="..\..\libsndfile\src\ima_oki_adpcm.h" />
-    <ClInclude Include="..\..\libsndfile\src\sf_unistd.h" />
-    <ClInclude Include="..\..\libsndfile\src\sfconfig.h" />
-    <ClInclude Include="..\..\libsndfile\src\sfendian.h" />
-    <ClInclude Include="..\..\libsndfile\src\test_main.h" />
-    <ClInclude Include="..\..\libsndfile\src\wav_w64.h" />
-    <ClInclude Include="SndFile\config.h" />
-    <ClInclude Include="SndFile\sndfile.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\libsndfile\src\libsndfile-1.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="LibFlac.vcxproj">
-      <Project>{38203d05-af71-4ff2-a183-a7d9cb8d2ae0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibOgg.vcxproj">
-      <Project>{c5c229ac-316d-42cb-9ca3-329619618972}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSndFileG72x.vcxproj">
-      <Project>{7016d4c2-a0ab-4bfd-9aa1-4ecdccbe6301}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSndFileGSM610.vcxproj">
-      <Project>{d2572de1-610e-46a4-8dd2-8a693347d76a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibVorbis.vcxproj">
-      <Project>{524a24cd-0973-4733-8eb9-f419dc6f9997}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibSndFileG72x.vcxproj
+++ /dev/null
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}</ProjectGuid>
-    <RootNamespace>G72x</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libsndfile\src\G72x\g721.c" />
-    <ClCompile Include="..\..\libsndfile\src\G72x\g723_16.c" />
-    <ClCompile Include="..\..\libsndfile\src\G72x\g723_24.c" />
-    <ClCompile Include="..\..\libsndfile\src\G72x\g723_40.c" />
-    <ClCompile Include="..\..\libsndfile\src\G72x\g72x.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libsndfile\src\G72x\g72x.h" />
-    <ClInclude Include="..\..\libsndfile\src\G72x\g72x_priv.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibSndFileGSM610.vcxproj
+++ /dev/null
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D2572DE1-610E-46A4-8DD2-8A693347D76A}</ProjectGuid>
-    <RootNamespace>GSM610</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libsndfile\src\GSM610\add.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\code.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\decode.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\gsm_create.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\gsm_decode.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\gsm_destroy.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\gsm_encode.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\gsm_option.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\long_term.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\lpc.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\preprocess.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\rpe.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\short_term.c" />
-    <ClCompile Include="..\..\libsndfile\src\GSM610\table.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libsndfile\src\GSM610\config.h" />
-    <ClInclude Include="..\..\libsndfile\src\GSM610\gsm.h" />
-    <ClInclude Include="..\..\libsndfile\src\GSM610\gsm610_priv.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibSoX.vcxproj
+++ /dev/null
@@ -1,341 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F17BE535-C7E8-4930-A6FD-32498D73A533}</ProjectGuid>
-    <RootNamespace>LibSoX</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4100;4125;4127;4295;4244;4706</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4100;4125;4127;4295;4244;4706</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\adpcm.h" />
-    <ClInclude Include="..\src\adpcms.h" />
-    <ClInclude Include="..\src\aiff.h" />
-    <ClInclude Include="..\src\amr.h" />
-    <ClInclude Include="..\src\band.h" />
-    <ClInclude Include="..\src\biquad.h" />
-    <ClInclude Include="..\src\compandt.h" />
-    <ClInclude Include="..\src\cvsd.h" />
-    <ClInclude Include="..\src\cvsdfilt.h" />
-    <ClInclude Include="..\src\dft_filter.h" />
-    <ClInclude Include="..\src\dither.h" />
-    <ClInclude Include="..\src\effects.h" />
-    <ClInclude Include="..\src\fft4g.h" />
-    <ClInclude Include="..\src\fifo.h" />
-    <ClInclude Include="..\src\formats.h" />
-    <ClInclude Include="..\src\g711.h" />
-    <ClInclude Include="..\src\g72x.h" />
-    <ClInclude Include="..\src\ima_rw.h" />
-    <ClInclude Include="..\src\mcompand_xover.h" />
-    <ClInclude Include="..\src\mp3-util.h" />
-    <ClInclude Include="..\src\noisered.h" />
-    <ClInclude Include="..\src\rate_filters.h" />
-    <ClInclude Include="..\src\rate_half_fir.h" />
-    <ClInclude Include="..\src\rate_poly_fir.h" />
-    <ClInclude Include="..\src\rate_poly_fir0.h" />
-    <ClInclude Include="..\src\raw.h" />
-    <ClInclude Include="..\src\sox.h" />
-    <ClInclude Include="..\src\sox_i.h" />
-    <ClInclude Include="..\src\sox_sample_test.h" />
-    <ClInclude Include="..\src\soxomp.h" />
-    <ClInclude Include="..\src\util.h" />
-    <ClInclude Include="..\src\vox.h" />
-    <ClInclude Include="..\src\win32-ltdl.h" />
-    <ClInclude Include="..\src\xmalloc.h" />
-    <ClInclude Include="SoX\soxconfig.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\alsa.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\ao.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\coreaudio.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\example0.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\example1.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\example2.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\example3.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\example4.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\oss.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\pulseaudio.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\skeleff.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\skelform.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\sndio.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\sox_sample_test.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\sunaudio.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\src\bend.c" />
-    <ClCompile Include="..\src\biquad.c" />
-    <ClCompile Include="..\src\biquads.c" />
-    <ClCompile Include="..\src\chorus.c" />
-    <ClCompile Include="..\src\compand.c" />
-    <ClCompile Include="..\src\compandt.c" />
-    <ClCompile Include="..\src\contrast.c" />
-    <ClCompile Include="..\src\dcshift.c" />
-    <ClCompile Include="..\src\delay.c" />
-    <ClCompile Include="..\src\dft_filter.c" />
-    <ClCompile Include="..\src\dither.c" />
-    <ClCompile Include="..\src\divide.c" />
-    <ClCompile Include="..\src\downsample.c" />
-    <ClCompile Include="..\src\earwax.c" />
-    <ClCompile Include="..\src\echo.c" />
-    <ClCompile Include="..\src\echos.c" />
-    <ClCompile Include="..\src\fade.c" />
-    <ClCompile Include="..\src\fir.c" />
-    <ClCompile Include="..\src\firfit.c" />
-    <ClCompile Include="..\src\flanger.c" />
-    <ClCompile Include="..\src\gain.c" />
-    <ClCompile Include="..\src\hilbert.c" />
-    <ClCompile Include="..\src\input.c" />
-    <ClCompile Include="..\src\ladspa.c" />
-    <ClCompile Include="..\src\loudness.c" />
-    <ClCompile Include="..\src\mcompand.c" />
-    <ClCompile Include="..\src\noiseprof.c" />
-    <ClCompile Include="..\src\noisered.c" />
-    <ClCompile Include="..\src\output.c" />
-    <ClCompile Include="..\src\overdrive.c" />
-    <ClCompile Include="..\src\pad.c" />
-    <ClCompile Include="..\src\phaser.c" />
-    <ClCompile Include="..\src\rate.c" />
-    <ClCompile Include="..\src\remix.c" />
-    <ClCompile Include="..\src\repeat.c" />
-    <ClCompile Include="..\src\reverb.c" />
-    <ClCompile Include="..\src\reverse.c" />
-    <ClCompile Include="..\src\silence.c" />
-    <ClCompile Include="..\src\sinc.c" />
-    <ClCompile Include="..\src\spectrogram.c" />
-    <ClCompile Include="..\src\speed.c" />
-    <ClCompile Include="..\src\speexdsp.c" />
-    <ClCompile Include="..\src\splice.c" />
-    <ClCompile Include="..\src\stat.c" />
-    <ClCompile Include="..\src\stats.c" />
-    <ClCompile Include="..\src\stretch.c" />
-    <ClCompile Include="..\src\swap.c" />
-    <ClCompile Include="..\src\synth.c" />
-    <ClCompile Include="..\src\tempo.c" />
-    <ClCompile Include="..\src\tremolo.c" />
-    <ClCompile Include="..\src\trim.c" />
-    <ClCompile Include="..\src\upsample.c" />
-    <ClCompile Include="..\src\vad.c" />
-    <ClCompile Include="..\src\vol.c" />
-    <ClCompile Include="..\src\8svx.c" />
-    <ClCompile Include="..\src\aifc-fmt.c" />
-    <ClCompile Include="..\src\aiff-fmt.c" />
-    <ClCompile Include="..\src\al-fmt.c" />
-    <ClCompile Include="..\src\amr-nb.c" />
-    <ClCompile Include="..\src\amr-wb.c" />
-    <ClCompile Include="..\src\au.c" />
-    <ClCompile Include="..\src\avr.c" />
-    <ClCompile Include="..\src\caf.c" />
-    <ClCompile Include="..\src\cdr.c" />
-    <ClCompile Include="..\src\cvsd-fmt.c" />
-    <ClCompile Include="..\src\dat.c" />
-    <ClCompile Include="..\src\dvms-fmt.c" />
-    <ClCompile Include="..\src\f4-fmt.c" />
-    <ClCompile Include="..\src\f8-fmt.c" />
-    <ClCompile Include="..\src\fap.c" />
-    <ClCompile Include="..\src\flac.c" />
-    <ClCompile Include="..\src\gsm.c" />
-    <ClCompile Include="..\src\gsrt.c" />
-    <ClCompile Include="..\src\hcom.c" />
-    <ClCompile Include="..\src\htk.c" />
-    <ClCompile Include="..\src\ima-fmt.c" />
-    <ClCompile Include="..\src\ima_rw.c" />
-    <ClCompile Include="..\src\la-fmt.c" />
-    <ClCompile Include="..\src\lpc10.c" />
-    <ClCompile Include="..\src\lu-fmt.c" />
-    <ClCompile Include="..\src\mat4.c" />
-    <ClCompile Include="..\src\mat5.c" />
-    <ClCompile Include="..\src\maud.c" />
-    <ClCompile Include="..\src\mp3.c" />
-    <ClCompile Include="..\src\nulfile.c" />
-    <ClCompile Include="..\src\paf.c" />
-    <ClCompile Include="..\src\prc.c" />
-    <ClCompile Include="..\src\pvf.c" />
-    <ClCompile Include="..\src\raw-fmt.c" />
-    <ClCompile Include="..\src\s1-fmt.c" />
-    <ClCompile Include="..\src\s2-fmt.c" />
-    <ClCompile Include="..\src\s3-fmt.c" />
-    <ClCompile Include="..\src\s4-fmt.c" />
-    <ClCompile Include="..\src\sd2.c" />
-    <ClCompile Include="..\src\sf.c" />
-    <ClCompile Include="..\src\smp.c" />
-    <ClCompile Include="..\src\sndfile.c" />
-    <ClCompile Include="..\src\sounder.c" />
-    <ClCompile Include="..\src\soundtool.c" />
-    <ClCompile Include="..\src\sox-fmt.c" />
-    <ClCompile Include="..\src\sphere.c" />
-    <ClCompile Include="..\src\tx16w.c" />
-    <ClCompile Include="..\src\u1-fmt.c" />
-    <ClCompile Include="..\src\u2-fmt.c" />
-    <ClCompile Include="..\src\u3-fmt.c" />
-    <ClCompile Include="..\src\u4-fmt.c" />
-    <ClCompile Include="..\src\ul-fmt.c" />
-    <ClCompile Include="..\src\voc.c" />
-    <ClCompile Include="..\src\vorbis.c" />
-    <ClCompile Include="..\src\vox-fmt.c" />
-    <ClCompile Include="..\src\vox.c" />
-    <ClCompile Include="..\src\w64.c" />
-    <ClCompile Include="..\src\wav.c" />
-    <ClCompile Include="..\src\waveaudio.c" />
-    <ClCompile Include="..\src\wavpack.c">
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4142;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4142;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <ClCompile Include="..\src\wve.c" />
-    <ClCompile Include="..\src\xa.c" />
-    <ClCompile Include="..\src\xi.c" />
-    <ClCompile Include="..\src\adpcm.c" />
-    <ClCompile Include="..\src\adpcms.c" />
-    <ClCompile Include="..\src\aiff.c" />
-    <ClCompile Include="..\src\cvsd.c" />
-    <ClCompile Include="..\src\effects.c" />
-    <ClCompile Include="..\src\effects_i.c" />
-    <ClCompile Include="..\src\effects_i_dsp.c" />
-    <ClCompile Include="..\src\fft4g.c" />
-    <ClCompile Include="..\src\formats.c" />
-    <ClCompile Include="..\src\formats_i.c" />
-    <ClCompile Include="..\src\g711.c" />
-    <ClCompile Include="..\src\g721.c" />
-    <ClCompile Include="..\src\g723_24.c" />
-    <ClCompile Include="..\src\g723_40.c" />
-    <ClCompile Include="..\src\g72x.c" />
-    <ClCompile Include="..\src\getopt.c" />
-    <ClCompile Include="..\src\libsox.c" />
-    <ClCompile Include="..\src\libsox_i.c" />
-    <ClCompile Include="..\src\raw.c" />
-    <ClCompile Include="..\src\util.c" />
-    <ClCompile Include="..\src\win32-ltdl.c" />
-    <ClCompile Include="..\src\xmalloc.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/msvc10/LibSoX.vcxproj.filters
+++ /dev/null
@@ -1,598 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Config Headers">
-      <UniqueIdentifier>{28638e5e-b540-47d4-bee5-296f96ea65d7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Excluded Sources">
-      <UniqueIdentifier>{88d3ba5f-c07b-47a6-8d31-2ca7a9890e6d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Effect Sources">
-      <UniqueIdentifier>{2fe3c03a-d755-4882-afbf-c1eb806117c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Format Sources">
-      <UniqueIdentifier>{6ad57da4-219f-4dd0-8c47-883521cd0af6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Shared Sources">
-      <UniqueIdentifier>{027d9299-ae71-4cad-8b6c-01d28b65d3d3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\adpcm.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\adpcms.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\aiff.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\amr.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\band.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\biquad.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\compandt.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\cvsd.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\cvsdfilt.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\dft_filter.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\dither.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\effects.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\fft4g.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\fifo.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\formats.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\g711.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\g72x.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\ima_rw.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\mcompand_xover.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\mp3-util.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\noisered.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\rate_filters.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\rate_half_fir.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\rate_poly_fir.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\rate_poly_fir0.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\raw.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sox.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sox_i.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sox_sample_test.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\soxomp.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\util.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\vox.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\win32-ltdl.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\xmalloc.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="SoX\soxconfig.h">
-      <Filter>Config Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\alsa.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ao.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\coreaudio.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\example0.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\example1.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\example2.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\example3.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\example4.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\oss.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\pulseaudio.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\skeleff.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\skelform.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sndio.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sox_sample_test.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sunaudio.c">
-      <Filter>Excluded Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\bend.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\biquad.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\biquads.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\chorus.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\compand.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\compandt.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\contrast.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dcshift.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\delay.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dft_filter.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dither.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\divide.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\earwax.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\echo.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\echos.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\fade.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\fir.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\firfit.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\flanger.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\gain.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\input.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ladspa.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\loudness.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\mcompand.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\noiseprof.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\noisered.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\output.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\overdrive.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\pad.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phaser.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\rate.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\remix.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\repeat.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\reverb.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\reverse.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\silence.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sinc.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\spectrogram.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\speed.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\speexdsp.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\splice.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\stat.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\stats.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\stretch.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\swap.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\synth.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tempo.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tremolo.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\trim.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vad.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vol.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\8svx.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\aifc-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\aiff-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\al-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\amr-nb.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\amr-wb.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\au.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\avr.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\caf.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cdr.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cvsd-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dat.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\dvms-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\f4-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\f8-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\fap.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\flac.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\gsm.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\gsrt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hcom.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\htk.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ima-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ima_rw.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\la-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\lpc10.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\lu-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\mat4.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\mat5.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\maud.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\mp3.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\nulfile.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\paf.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\prc.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\pvf.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\raw-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\s1-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\s2-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\s3-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\s4-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sd2.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sf.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\smp.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sndfile.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sounder.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\soundtool.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sox-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\sphere.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\tx16w.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\u1-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\u2-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\u3-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\u4-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ul-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\voc.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vorbis.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vox-fmt.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\vox.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\w64.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\wav.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\waveaudio.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\wavpack.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\wve.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xa.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xi.c">
-      <Filter>Format Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\adpcm.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\adpcms.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\aiff.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cvsd.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\effects.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\effects_i.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\effects_i_dsp.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\fft4g.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\formats.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\formats_i.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\g711.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\g721.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\g723_24.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\g723_40.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\g72x.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\getopt.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\libsox.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\libsox_i.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\raw.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\util.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\win32-ltdl.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\xmalloc.c">
-      <Filter>Shared Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\hilbert.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\upsample.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\downsample.c">
-      <Filter>Effect Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
--- a/msvc10/LibSpeex.vcxproj
+++ /dev/null
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{60902B83-8B26-4DBD-B635-4CECF5F4744C}</ProjectGuid>
-    <RootNamespace>LibSpeex</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../speex/include;../../speex/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;M_PI=3.14159265358979323846;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../speex/include;../../speex/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;M_PI=3.14159265358979323846;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4018;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\speex\libspeex\bits.c" />
-    <ClCompile Include="..\..\speex\libspeex\cb_search.c" />
-    <ClCompile Include="..\..\speex\libspeex\exc_10_16_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\exc_10_32_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\exc_20_32_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\exc_5_256_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\exc_5_64_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\exc_8_128_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\fftwrap.c" />
-    <ClCompile Include="..\..\speex\libspeex\filterbank.c" />
-    <ClCompile Include="..\..\speex\libspeex\filters.c" />
-    <ClCompile Include="..\..\speex\libspeex\gain_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\gain_table_lbr.c" />
-    <ClCompile Include="..\..\speex\libspeex\hexc_10_32_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\hexc_table.c" />
-    <ClCompile Include="..\..\speex\libspeex\high_lsp_tables.c" />
-    <ClCompile Include="..\..\speex\libspeex\jitter.c" />
-    <ClCompile Include="..\..\speex\libspeex\kiss_fft.c" />
-    <ClCompile Include="..\..\speex\libspeex\kiss_fftr.c" />
-    <ClCompile Include="..\..\speex\libspeex\lpc.c" />
-    <ClCompile Include="..\..\speex\libspeex\lsp.c" />
-    <ClCompile Include="..\..\speex\libspeex\lsp_tables_nb.c" />
-    <ClCompile Include="..\..\speex\libspeex\ltp.c" />
-    <ClCompile Include="..\..\speex\libspeex\mdf.c" />
-    <ClCompile Include="..\..\speex\libspeex\modes.c" />
-    <ClCompile Include="..\..\speex\libspeex\modes_wb.c" />
-    <ClCompile Include="..\..\speex\libspeex\nb_celp.c" />
-    <ClCompile Include="..\..\speex\libspeex\preprocess.c" />
-    <ClCompile Include="..\..\speex\libspeex\quant_lsp.c" />
-    <ClCompile Include="..\..\speex\libspeex\sb_celp.c" />
-    <ClCompile Include="..\..\speex\libspeex\scal.c" />
-    <ClCompile Include="..\..\speex\libspeex\smallft.c" />
-    <ClCompile Include="..\..\speex\libspeex\speex.c" />
-    <ClCompile Include="..\..\speex\libspeex\speex_callbacks.c" />
-    <ClCompile Include="..\..\speex\libspeex\speex_header.c" />
-    <ClCompile Include="..\..\speex\libspeex\stereo.c" />
-    <ClCompile Include="..\..\speex\libspeex\vbr.c" />
-    <ClCompile Include="..\..\speex\libspeex\vq.c" />
-    <ClCompile Include="..\..\speex\libspeex\window.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\speex\libspeex\cb_search.h" />
-    <ClInclude Include="..\..\speex\libspeex\cb_search_sse.h" />
-    <ClInclude Include="..\..\speex\win32\config.h" />
-    <ClInclude Include="..\..\speex\libspeex\fftwrap.h" />
-    <ClInclude Include="..\..\speex\libspeex\filterbank.h" />
-    <ClInclude Include="..\..\speex\libspeex\filters.h" />
-    <ClInclude Include="..\..\speex\libspeex\filters_sse.h" />
-    <ClInclude Include="..\..\speex\libspeex\fixed_bfin.h" />
-    <ClInclude Include="..\..\speex\libspeex\fixed_debug.h" />
-    <ClInclude Include="..\..\speex\libspeex\fixed_generic.h" />
-    <ClInclude Include="..\..\speex\libspeex\kiss_fft.h" />
-    <ClInclude Include="..\..\speex\libspeex\kiss_fftr.h" />
-    <ClInclude Include="..\..\speex\libspeex\lpc.h" />
-    <ClInclude Include="..\..\speex\libspeex\lsp.h" />
-    <ClInclude Include="..\..\speex\libspeex\ltp.h" />
-    <ClInclude Include="..\..\speex\libspeex\ltp_sse.h" />
-    <ClInclude Include="..\..\speex\libspeex\math_approx.h" />
-    <ClInclude Include="..\..\speex\libspeex\modes.h" />
-    <ClInclude Include="..\..\speex\libspeex\nb_celp.h" />
-    <ClInclude Include="..\..\speex\libspeex\os_support.h" />
-    <ClInclude Include="..\..\speex\libspeex\pseudofloat.h" />
-    <ClInclude Include="..\..\speex\libspeex\quant_lsp.h" />
-    <ClInclude Include="..\..\speex\libspeex\resample_sse.h" />
-    <ClInclude Include="..\..\speex\libspeex\sb_celp.h" />
-    <ClInclude Include="..\..\speex\libspeex\smallft.h" />
-    <ClInclude Include="..\..\speex\libspeex\stack_alloc.h" />
-    <ClInclude Include="..\..\speex\libspeex\vbr.h" />
-    <ClInclude Include="..\..\speex\libspeex\vorbis_psy.h" />
-    <ClInclude Include="..\..\speex\libspeex\vq.h" />
-    <ClInclude Include="..\..\speex\libspeex\vq_sse.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
--- a/msvc10/LibVorbis.vcxproj
+++ /dev/null
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{524A24CD-0973-4733-8EB9-F419DC6F9997}</ProjectGuid>
-    <RootNamespace>LibVorbis</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../libogg/include;../../libvorbis/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LIBVORBIS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4554;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../libogg/include;../../libvorbis/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LIBVORBIS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4554;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\libvorbis\lib\analysis.c" />
-    <ClCompile Include="..\..\libvorbis\lib\bitrate.c" />
-    <ClCompile Include="..\..\libvorbis\lib\block.c" />
-    <ClCompile Include="..\..\libvorbis\lib\codebook.c" />
-    <ClCompile Include="..\..\libvorbis\lib\envelope.c" />
-    <ClCompile Include="..\..\libvorbis\lib\floor0.c" />
-    <ClCompile Include="..\..\libvorbis\lib\floor1.c" />
-    <ClCompile Include="..\..\libvorbis\lib\info.c" />
-    <ClCompile Include="..\..\libvorbis\lib\lookup.c" />
-    <ClCompile Include="..\..\libvorbis\lib\lpc.c" />
-    <ClCompile Include="..\..\libvorbis\lib\lsp.c" />
-    <ClCompile Include="..\..\libvorbis\lib\mapping0.c" />
-    <ClCompile Include="..\..\libvorbis\lib\mdct.c" />
-    <ClCompile Include="..\..\libvorbis\lib\psy.c" />
-    <ClCompile Include="..\..\libvorbis\lib\registry.c" />
-    <ClCompile Include="..\..\libvorbis\lib\res0.c" />
-    <ClCompile Include="..\..\libvorbis\lib\sharedbook.c" />
-    <ClCompile Include="..\..\libvorbis\lib\smallft.c" />
-    <ClCompile Include="..\..\libvorbis\lib\synthesis.c" />
-    <ClCompile Include="..\..\libvorbis\lib\vorbisenc.c" />
-    <ClCompile Include="..\..\libvorbis\lib\vorbisfile.c" />
-    <ClCompile Include="..\..\libvorbis\lib\window.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\libvorbis\lib\backends.h" />
-    <ClInclude Include="..\..\libvorbis\lib\bitrate.h" />
-    <ClInclude Include="..\..\libvorbis\lib\codebook.h" />
-    <ClInclude Include="..\..\libvorbis\lib\codec_internal.h" />
-    <ClInclude Include="..\..\libvorbis\lib\envelope.h" />
-    <ClInclude Include="..\..\libvorbis\lib\highlevel.h" />
-    <ClInclude Include="..\..\libvorbis\lib\lookup.h" />
-    <ClInclude Include="..\..\libvorbis\lib\lookup_data.h" />
-    <ClInclude Include="..\..\libvorbis\lib\lpc.h" />
-    <ClInclude Include="..\..\libvorbis\lib\lsp.h" />
-    <ClInclude Include="..\..\libvorbis\lib\masking.h" />
-    <ClInclude Include="..\..\libvorbis\lib\mdct.h" />
-    <ClInclude Include="..\..\libvorbis\lib\misc.h" />
-    <ClInclude Include="..\..\libvorbis\lib\os.h" />
-    <ClInclude Include="..\..\libvorbis\lib\psy.h" />
-    <ClInclude Include="..\..\libvorbis\lib\registry.h" />
-    <ClInclude Include="..\..\libvorbis\lib\scales.h" />
-    <ClInclude Include="..\..\libvorbis\lib\smallft.h" />
-    <ClInclude Include="..\..\libvorbis\lib\window.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/msvc10/LibWavPack.vcxproj
+++ /dev/null
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7461CC57-B1CB-4766-B357-F51587449474}</ProjectGuid>
-    <RootNamespace>LibWavPack</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPT_MMX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPT_MMX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\wavpack\src\bits.c" />
-    <ClCompile Include="..\..\wavpack\src\extra1.c" />
-    <ClCompile Include="..\..\wavpack\src\extra2.c" />
-    <ClCompile Include="..\..\wavpack\src\float.c" />
-    <ClCompile Include="..\..\wavpack\src\metadata.c" />
-    <ClCompile Include="..\..\wavpack\src\pack.c" />
-    <ClCompile Include="..\..\wavpack\src\tags.c" />
-    <ClCompile Include="..\..\wavpack\src\unpack.c" />
-    <ClCompile Include="..\..\wavpack\src\unpack3.c" />
-    <ClCompile Include="..\..\wavpack\src\words.c" />
-    <ClCompile Include="..\..\wavpack\src\wputils.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\wavpack\src\unpack3.h" />
-    <ClInclude Include="..\..\wavpack\include\wavpack.h" />
-    <ClInclude Include="..\..\wavpack\src\wavpack_local.h" />
-    <ClInclude Include="..\..\wavpack\src\wavpack_version.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/msvc10/LibZLib.vcxproj
+++ /dev/null
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{90D19FCF-8560-4396-A250-DDF74D1B0E36}</ProjectGuid>
-    <RootNamespace>LibZLib</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\lib\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;Z_SOLO;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4142</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;Z_SOLO;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4142</DisableSpecificWarnings>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\zlib\adler32.c" />
-    <ClCompile Include="..\..\zlib\compress.c" />
-    <ClCompile Include="..\..\zlib\crc32.c" />
-    <ClCompile Include="..\..\zlib\deflate.c" />
-    <ClCompile Include="..\..\zlib\infback.c" />
-    <ClCompile Include="..\..\zlib\inffast.c" />
-    <ClCompile Include="..\..\zlib\inflate.c" />
-    <ClCompile Include="..\..\zlib\inftrees.c" />
-    <ClCompile Include="..\..\zlib\trees.c" />
-    <ClCompile Include="..\..\zlib\uncompr.c" />
-    <ClCompile Include="..\..\zlib\zutil.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\zlib\crc32.h" />
-    <ClInclude Include="..\..\zlib\deflate.h" />
-    <ClInclude Include="..\..\zlib\inffast.h" />
-    <ClInclude Include="..\..\zlib\inffixed.h" />
-    <ClInclude Include="..\..\zlib\inflate.h" />
-    <ClInclude Include="..\..\zlib\inftrees.h" />
-    <ClInclude Include="..\..\zlib\trees.h" />
-    <ClInclude Include="..\..\zlib\zconf.h" />
-    <ClInclude Include="..\..\zlib\zconf.in.h" />
-    <ClInclude Include="..\..\zlib\zlib.h" />
-    <ClInclude Include="..\..\zlib\zutil.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/msvc10/Mad/LibMad.def
+++ /dev/null
@@ -1,60 +1,0 @@
-; libSoX libmad export definitions for MSVC9: (c) 2009 SoX contributors
-;
-; This library is free software; you can redistribute it and/or modify it
-; under the terms of the GNU Lesser General Public License as published by
-; the Free Software Foundation; either version 2.1 of the License, or (at
-; your option) any later version.
-;
-; This library is distributed in the hope that it will be useful, but
-; WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
-; General Public License for more details.
-;
-; You should have received a copy of the GNU Lesser General Public License
-; along with this library; if not, write to the Free Software Foundation,
-; Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-;
-
-EXPORTS
-
-    mad_bit_crc
-    mad_bit_init
-    mad_bit_length
-    mad_bit_nextbyte
-    mad_bit_read
-    mad_bit_skip
-    
-    mad_decoder_init
-    mad_decoder_finish
-    mad_decoder_message
-    mad_decoder_run
-    
-    mad_frame_decode
-    mad_frame_finish
-    mad_frame_init
-    mad_frame_mute
-    
-    mad_header_decode
-    mad_header_init
-    
-    mad_stream_buffer
-    mad_stream_errorstr
-    mad_stream_finish
-    mad_stream_init
-    mad_stream_skip
-    mad_stream_sync
-    
-    mad_synth_frame
-    mad_synth_init
-    mad_synth_mute
-    
-    mad_timer_abs
-    mad_timer_add
-    mad_timer_compare
-    mad_timer_count
-    mad_timer_fraction
-    mad_timer_multiply
-    mad_timer_negate
-    mad_timer_set
-    mad_timer_string
-    mad_timer_zero
--- a/msvc10/Mad/config.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/* libSoX libmad config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <msvc++/config.h>
-#define FPM_INTEL
--- a/msvc10/Makefile.am
+++ /dev/null
@@ -1,31 +1,0 @@
-EXTRA_DIST= \
-	LibFlac.vcxproj \
-	LibGsm.vcxproj \
-	LibId3Tag.vcxproj \
-	LibLpc10.vcxproj \
-	LibMad.vcxproj \
-	LibMp3Lame.vcxproj \
-	LibOgg.vcxproj \
-	LibPng.vcxproj \
-	LibSndFileG72x.vcxproj \
-	LibSndFileGSM610.vcxproj \
-	LibSndFile.vcxproj \
-	LibSoX.vcxproj \
-	LibSoX.vcxproj.filters \
-	LibSpeex.vcxproj \
-	LibVorbis.vcxproj \
-	LibWavPack.vcxproj \
-	LibZLib.vcxproj \
-	Readme.txt \
-	SoX.sln \
-	SoX.vcxproj \
-	Mad/config.h \
-	Mad/LibMad.def \
-	Mp3Lame/config.h \
-	Png/inttypes.h \
-	Png/pnglibconf.h \
-	SndFile/config.h \
-	SndFile/inttypes.h \
-	SndFile/sndfile.h \
-	SndFile/sys/time.h \
-	SoX/soxconfig.h
--- a/msvc10/Mp3Lame/config.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/* libSoX libmp3lame config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define HAVE_MPGLIB 1
-#include <configMS.h>
--- a/msvc10/Png/inttypes.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libpng stub file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Nothing here. */
--- a/msvc10/Png/pnglibconf.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libpng config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "../../../libpng/scripts/pnglibconf.h.prebuilt"
\ No newline at end of file
--- a/msvc10/Readme.txt
+++ /dev/null
@@ -1,110 +1,0 @@
-This directory includes hand-crafted project files for building SoX using the
-Microsoft Visual C++ 10.0 (or later) compilers, available through Visual Studio
-2010, Visual Studio 2012, or by downloading the freely-available Microsoft
-Windows SDK 7.1. This is the easiest way to build SoX with MS Visual C++.
-The resulting sox.exe has support for all SoX features except magic, ladspa,
-and pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or
-cygmad-0.dll), libsndfile (libsndfile-1.dll), and AMR support (libamrnb-3.dll,
-libamrwb-3.dll) are loaded at runtime if they are available.
-
-How to build:
-
-1. If you don't already have it, install .NET 4.0 (required for msbuild).
-
-   If you don't already have Visual Studio 2010 (or later) or the Windows SDK
-   7.1 (or later) installed, download and install the Windows SDK 7.1 from
-   Microsoft:
-
-   http://www.microsoft.com/downloads/en/details.aspx?FamilyID=6b6c21d2-2006-4afa-9702-529fa782d63b&displaylang=en
-
-   When installing the Windows SDK, include at least the following features:
-   * Windows Headers and Libraries - Windows Headers
-   * Windows Headers and Libraries - x86 Libraries
-   * Windows Native Code Development - Tools
-   * Windows Native Code Development - Visual C++ Compilers
-
-2. Put the SoX code into a directory named sox.
-
-   Extract the source code for the other libraries next to the sox
-   directory. Remove the version numbers from the directory names.
-   The following versions were tested and successfully built:
-   -- flac-1.2.1.tar.gz extracted into directory flac
-   -- lame-398.4.tar.gz extracted into directory lame
-   -- libid3tag-0.15.1b.tar.gz extracted into directory libid3tag
-   -- libmad-0.15.1b.tar.gz extracted into directory libmad
-   -- libogg-1.2.2.tar.gz extracted into directory libogg
-   -- libpng-1.5.1.tar.gz extracted into directory libpng
-   -- libsndfile-1.0.23.tar.gz extracted into directory libsndfile
-   -- libvorbis-1.3.2.tar.gz extracted into directory libvorbis
-   -- speex-1.2rc1.tar.gz extracted into directory speex
-   -- wavpack-4.60.1.tar.bz2 extracted into directory wavpack
-   -- zlib-1.2.5.tar.gz extracted into directory zlib
-
-3. If using Visual Studio, open the sox\msvc10\SoX.sln solution in Visual
-   Studio.
-
-   If using the Windows SDK, open a normal command prompt, then run:
-"c:\Program Files\Microsoft SDKs\Windows\v7.1\bin\SetEnv.cmd" /x86 /Release /xp
-   then CD to the sox\msvc10 folder.
-
-4. If any of the above libraries are not available or not wanted, adjust the
-   corresponding HAVE_* settings in the soxconfig.h file and remove the
-   corresponding project from the SoX.sln solution.
-
-   If using Visual Studio, you will find the soxconfig.h file in the LibSox
-   project's Config Files folder.
-
-   If using the Windows SDK, you'll have to use a text editor (i.e. notepad) to
-   edit the soxconfig.h file (sox\msvc10\sox\soxconfig.h), and you'll have to
-   manually remove the entries for the unwanted projects.
-
-5. If using Visual Studio, build the solution using the GUI.
-
-   If using the Windows SDK, run: msbuild SoX.sln
-
-6. The resulting executable files will be in sox\msvc10\Debug or
-   sox\msvc10\Release. The resulting sox.exe will dynamically link to
-   libmp3lame.dll, libmad.dll, libsndfile-1.dll, libamrnb-3.dll, and
-   libamrwb-3.dll if they are available, but will run without them (though the
-   corresponding features will be unavailable if they are not present).
-
-Points to note:
-
-- The libsndfile-1.0.20.tar.gz package does not include the sndfile.h header
-  file. Normally, before compiling libsndfile, you would create sndfile.h
-  (either by processing it via autoconf, by downloading a copy, or by renaming
-  sndfile.h.in). However, this SoX solution includes its own version of
-  sndfile.h, so you should not create a sndfile.h under the libsndfile folder.
-  To repeat: you should extract a clean copy of libsndfile-1.0.20.tar.gz, and
-  should not add, process, or rename any files.
-
-- The solution includes an experimental effect called speexdsp that uses the
-  speex DSP library. This does not yet enable any support for the speex file
-  format or speex codec. The speexdsp effect is simply an experimental effect
-  to make use of the automatic gain control and noise filtering components that
-  are part of the speex codec package. Support for the speex codec may be added
-  later.
-
-- The included projects do not enable SSE2. You can enable this in the project
-  properties under Configuration Properties, C/C++, Code Generation, Enable
-  Enhanced Instruction Set. Note that some editions of Visual Studio might
-  not include Enhanced Instruction Set support.
-
-- The included projects set the floating-point model to "fast". This means
-  that the compiler is free to optimize floating-point operations. For
-  example, the compiler might optimize the expression (14.0 * x / 7.0) into
-  (x * 2.0). In addition, the compiler is allowed to leave expression results
-  in floating-point registers to store temporary values instead of rounding
-  each intermediate result to a 32-bit or 64-bit value. In some cases, these
-  optimizations can change the results of floating-point calculations. If you
-  need more precise results, you can change this optimization setting to one of
-  the other values. The "precise" setting avoids any optimization that might
-  possibly produce less-accurate results (it preserves the order of all
-  operations) but keeps optimizations that might give unexpectedly-accurate
-  results (for example, it might keep a temporary result in a double-precision
-  register instead of rounding it to single-precision). The "strict" setting
-  avoids any optimization that might change the result in any way contrary to
-  the C/C++ standard and rounds every intermediate result to the requested
-  precision according to standard floating-point rounding rules. You can change
-  this setting in the project properties under Configuration Properties, C/C++,
-  Code Generation, Floating Point Model.
--- a/msvc10/SndFile/config.h
+++ /dev/null
@@ -1,303 +1,0 @@
-/* libSoX libsndfile config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define inline __inline
-typedef __int64 __int64_t;
-typedef __int64 int64_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-#define ptrdiff_t ssize_t
-#define snprintf _snprintf
-#define __func__ __FUNCTION__
-#define FLAC__NO_DLL
-#define lrint(f)  ((long)(f))
-#define lrintf(f) lrint(f)
-
-/* Set to 1 if the compile is GNU GCC. */
-#undef COMPILER_IS_GCC
-
-/* Target processor clips on negative float to int conversion. */
-#define CPU_CLIPS_NEGATIVE 0
-
-/* Target processor clips on positive float to int conversion. */
-#define CPU_CLIPS_POSITIVE 0
-
-/* Target processor is big endian. */
-#define CPU_IS_BIG_ENDIAN 0
-
-/* Target processor is little endian. */
-#define CPU_IS_LITTLE_ENDIAN 1
-
-/* Set to 1 to enable experimental code. */
-#undef ENABLE_EXPERIMENTAL_CODE
-
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-#undef HAVE_ALSA_ASOUNDLIB_H
-
-/* Define to 1 if you have the <byteswap.h> header file. */
-#undef HAVE_BYTESWAP_H
-
-/* Define to 1 if you have the `calloc' function. */
-#define HAVE_CALLOC 1
-
-/* Define to 1 if you have the `ceil' function. */
-#define HAVE_CEIL 1
-
-/* Set to 1 if S_IRGRP is defined. */
-#undef HAVE_DECL_S_IRGRP
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <endian.h> header file. */
-#undef HAVE_ENDIAN_H
-
-/* Will be set to 1 if flac, ogg and vorbis are available. */
-#define HAVE_EXTERNAL_LIBS 1
-
-/* Set to 1 if the compile supports the struct hack. */
-#define HAVE_FLEXIBLE_ARRAY 1
-
-/* Define to 1 if you have the `floor' function. */
-#define HAVE_FLOOR 1
-
-/* Define to 1 if you have the `fmod' function. */
-#define HAVE_FMOD 1
-
-/* Define to 1 if you have the `free' function. */
-#define HAVE_FREE 1
-
-/* Define to 1 if you have the `fstat' function. */
-#define HAVE_FSTAT 1
-
-/* Define to 1 if you have the `fsync' function. */
-#undef HAVE_FSYNC
-
-/* Define to 1 if you have the `ftruncate' function. */
-#undef HAVE_FTRUNCATE
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the `gmtime' function. */
-#define HAVE_GMTIME 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Set to 1 if you have JACK. */
-#undef HAVE_JACK
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `localtime' function. */
-#define HAVE_LOCALTIME 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the `lseek' function. */
-#define HAVE_LSEEK 1
-
-/* Define to 1 if you have the `malloc' function. */
-#define HAVE_MALLOC 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `open' function. */
-#define HAVE_OPEN 1
-
-/* Define to 1 if you have the `pread' function. */
-#undef HAVE_PREAD
-
-/* Define to 1 if you have the `pwrite' function. */
-#undef HAVE_PWRITE
-
-/* Define to 1 if you have the `read' function. */
-#define HAVE_READ 1
-
-/* Define to 1 if you have the `realloc' function. */
-#define HAVE_REALLOC 1
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Set to 1 if you have libsqlite3. */
-#undef HAVE_SQLITE3
-
-/* Define to 1 if the system has the type `ssize_t'. */
-#undef HAVE_SSIZE_T
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Set to 1 if we have vorbis_version_string. */
-#undef HAVE_VORBIS_VERSION_STRING
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define to 1 if you have the `write' function. */
-#define HAVE_WRITE 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Set to 1 if compiling for MacOSX */
-#undef OS_IS_MACOSX
-
-/* Set to 1 if compiling for Win32 */
-#define OS_IS_WIN32 1
-
-/* Name of package */
-#define PACKAGE "libsndfile"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "erikd@mega-nerd.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libsndfile"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libsndfile 1.0.20"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libsndfile"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.20"
-
-/* Set to maximum allowed value of sf_count_t type. */
-//#define SF_COUNT_MAX (9223372036854775807i64)
-
-/* The size of `double', as computed by sizeof. */
-#define SIZEOF_DOUBLE (8)
-
-/* The size of `float', as computed by sizeof. */
-#define SIZEOF_FLOAT (4)
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT (4)
-
-/* The size of `int64_t', as computed by sizeof. */
-#define SIZEOF_INT64_T (8)
-
-/* The size of `loff_t', as computed by sizeof. */
-#undef SIZEOF_LOFF_T
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG (4)
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG (8)
-
-/* The size of `off64_t', as computed by sizeof. */
-#undef SIZEOF_OFF64_T
-
-/* The size of `off_t', as computed by sizeof. */
-#define SIZEOF_OFF_T (4)
-
-/* Set to sizeof (long) if unknown. */
-#define SIZEOF_SF_COUNT_T (8)
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT (2)
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T (4)
-
-/* The size of `ssize_t', as computed by sizeof. */
-#undef SIZEOF_SSIZE_T
-
-/* The size of `void*', as computed by sizeof. */
-#define SIZEOF_VOIDP (4)
-
-/* The size of `wchar_t', as computed by sizeof. */
-#define SIZEOF_WCHAR_T (2)
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Set to long if unknown. */
-#define TYPEOF_SF_COUNT_T __int64
-
-/* Set to 1 to use the native windows API */
-#define USE_WINDOWS_API 1
-
-/* Version number of package */
-#define VERSION "1.0.20"
-
-/* Set to 1 if windows DLL is being built. */
-#define WIN32_TARGET_DLL 1
-
-/* Target processor is big endian. */
-#undef WORDS_BIGENDIAN
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to make fseeko etc. visible, on some hosts. */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
--- a/msvc10/SndFile/inttypes.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libpng stub file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define PRId64 "lld"
--- a/msvc10/SndFile/sndfile.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/* libSoX libsndfile wrapper for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-typedef __int64 __int64_t;
-#include "../../libsndfile/src/sndfile.h.in"
--- a/msvc10/SndFile/sys/time.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libsndfile stub file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Nothing here. */
--- a/msvc10/SoX.sln
+++ /dev/null
@@ -1,116 +1,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSoX", "LibSoX.vcxproj", "{F17BE535-C7E8-4930-A6FD-32498D73A533}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoX", "SoX.vcxproj", "{AC136601-504C-4E1A-9DC8-0CC493AA0983}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibFlac", "LibFlac.vcxproj", "{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibGsm", "LibGsm.vcxproj", "{BEE9F57C-384E-4C99-87EB-629BF45C8A89}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLpc10", "LibLpc10.vcxproj", "{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibMad", "LibMad.vcxproj", "{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibMp3Lame", "LibMp3Lame.vcxproj", "{4DFD6FD1-96F1-434A-AC69-01783B876354}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOgg", "LibOgg.vcxproj", "{C5C229AC-316D-42CB-9CA3-329619618972}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng", "LibPng.vcxproj", "{46E7AC9D-3E96-4B34-B493-501BC277D6F9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibWavPack", "LibWavPack.vcxproj", "{7461CC57-B1CB-4766-B357-F51587449474}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibVorbis", "LibVorbis.vcxproj", "{524A24CD-0973-4733-8EB9-F419DC6F9997}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibZLib", "LibZLib.vcxproj", "{90D19FCF-8560-4396-A250-DDF74D1B0E36}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibId3Tag", "LibId3Tag.vcxproj", "{40EA92B6-38AA-4E67-894D-92C37C946402}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSndFileG72x", "LibSndFileG72x.vcxproj", "{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSndFileGSM610", "LibSndFileGSM610.vcxproj", "{D2572DE1-610E-46A4-8DD2-8A693347D76A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSndFile", "LibSndFile.vcxproj", "{342BDA83-C83F-4168-8425-E1DF72F47018}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSpeex", "LibSpeex.vcxproj", "{60902B83-8B26-4DBD-B635-4CECF5F4744C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Debug|Win32.Build.0 = Debug|Win32
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Release|Win32.ActiveCfg = Release|Win32
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Release|Win32.Build.0 = Release|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Debug|Win32.Build.0 = Debug|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Release|Win32.ActiveCfg = Release|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Release|Win32.Build.0 = Release|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Debug|Win32.Build.0 = Debug|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Release|Win32.ActiveCfg = Release|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Release|Win32.Build.0 = Release|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Debug|Win32.Build.0 = Debug|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Release|Win32.ActiveCfg = Release|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Release|Win32.Build.0 = Release|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Debug|Win32.Build.0 = Debug|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Release|Win32.ActiveCfg = Release|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Release|Win32.Build.0 = Release|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Debug|Win32.Build.0 = Debug|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Release|Win32.ActiveCfg = Release|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Release|Win32.Build.0 = Release|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Debug|Win32.Build.0 = Debug|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Release|Win32.ActiveCfg = Release|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Release|Win32.Build.0 = Release|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Debug|Win32.Build.0 = Debug|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Release|Win32.ActiveCfg = Release|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Release|Win32.Build.0 = Release|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Debug|Win32.Build.0 = Debug|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Release|Win32.ActiveCfg = Release|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Release|Win32.Build.0 = Release|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Debug|Win32.Build.0 = Debug|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Release|Win32.ActiveCfg = Release|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Release|Win32.Build.0 = Release|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Debug|Win32.ActiveCfg = Debug|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Debug|Win32.Build.0 = Debug|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Release|Win32.ActiveCfg = Release|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Release|Win32.Build.0 = Release|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Debug|Win32.Build.0 = Debug|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Release|Win32.ActiveCfg = Release|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Release|Win32.Build.0 = Release|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Debug|Win32.Build.0 = Debug|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Release|Win32.ActiveCfg = Release|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Release|Win32.Build.0 = Release|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Debug|Win32.Build.0 = Debug|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Release|Win32.ActiveCfg = Release|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Release|Win32.Build.0 = Release|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Debug|Win32.Build.0 = Debug|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Release|Win32.ActiveCfg = Release|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Release|Win32.Build.0 = Release|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Debug|Win32.ActiveCfg = Debug|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Debug|Win32.Build.0 = Debug|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Release|Win32.ActiveCfg = Release|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Release|Win32.Build.0 = Release|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Debug|Win32.Build.0 = Debug|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Release|Win32.ActiveCfg = Release|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/msvc10/SoX.vcxproj
+++ /dev/null
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AC136601-504C-4E1A-9DC8-0CC493AA0983}</ProjectGuid>
-    <RootNamespace>SoX</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PostBuildEventUseInBuild>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>SoX;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;SOX_IMPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>true</MinimalRebuild>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile>
-      <DelayLoadDLLs>winmm.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>
-      </OptimizeReferences>
-      <SetChecksum>true</SetChecksum>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>SoX;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;SOX_IMPORT;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)$(Configuration)\$(ProjectName).exe</OutputFile>
-      <DelayLoadDLLs>winmm.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <SetChecksum>true</SetChecksum>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\sox.c" />
-    <ClCompile Include="..\src\win32-glob.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\win32-glob.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="LibFlac.vcxproj">
-      <Project>{38203d05-af71-4ff2-a183-a7d9cb8d2ae0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibGsm.vcxproj">
-      <Project>{bee9f57c-384e-4c99-87eb-629bf45c8a89}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibId3Tag.vcxproj">
-      <Project>{40ea92b6-38aa-4e67-894d-92c37c946402}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibLpc10.vcxproj">
-      <Project>{c588ff17-fb2f-48d9-bb99-40b6d52b9b85}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibOgg.vcxproj">
-      <Project>{c5c229ac-316d-42cb-9ca3-329619618972}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibPng.vcxproj">
-      <Project>{46e7ac9d-3e96-4b34-b493-501bc277d6f9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSndFile.vcxproj">
-      <Project>{342bda83-c83f-4168-8425-e1df72f47018}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSndFileG72x.vcxproj">
-      <Project>{7016d4c2-a0ab-4bfd-9aa1-4ecdccbe6301}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSndFileGSM610.vcxproj">
-      <Project>{d2572de1-610e-46a4-8dd2-8a693347d76a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSoX.vcxproj">
-      <Project>{f17be535-c7e8-4930-a6fd-32498d73a533}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibSpeex.vcxproj">
-      <Project>{60902b83-8b26-4dbd-b635-4cecf5f4744c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibVorbis.vcxproj">
-      <Project>{524a24cd-0973-4733-8eb9-f419dc6f9997}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibWavPack.vcxproj">
-      <Project>{7461cc57-b1cb-4766-b357-f51587449474}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="LibZLib.vcxproj">
-      <Project>{90d19fcf-8560-4396-a250-ddf74d1b0e36}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/msvc10/SoX/soxconfig.h
+++ /dev/null
@@ -1,113 +1,0 @@
-/* libSoX config file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Enable some extra warnings.
-   Track the number of times each warning has been helpful. */
-#pragma warning(3: 4287) /* 0 - constant sign mismatch */
-#pragma warning(3: 4296) /* 1 - expression is always false */
-#pragma warning(3: 4365) /* 0 - conversion sign mismatch */
-#pragma warning(3: 4431) /* 0 - default int assumed */
-#pragma warning(3: 4545) /* 0 - comma expression */
-#pragma warning(3: 4546) /* 0 - comma expression */
-#pragma warning(3: 4547) /* 0 - comma expression */
-#pragma warning(3: 4548) /* 0 - comma expression */
-#pragma warning(3: 4549) /* 0 - comma expression */
-#pragma warning(3: 4555) /* 0 - expression has no effect */
-#pragma warning(3: 4628) /* 0 - digraph */
-#pragma warning(3: 4826) /* 0 - conversion sign extension */
-#pragma warning(3: 4837) /* 0 - trigraph */
-#pragma warning(3: 4905) /* 0 - string assignment mismatch */
-#pragma warning(3: 4906) /* 0 - string assignment mismatch */
-
-/* Used only by sox.c: */
-#define MORE_INTERACTIVE
-
-#define PACKAGE_EXTRA "msvc"
-
-/* Special behavior defined by win32-ltdl: "./" is replaced with the name of the
-   directory containing sox.exe. */
-#define PKGLIBDIR "./soxlib"
-
-#define HAVE_AMRNB 1
-#define STATIC_AMRNB 1
-#define DL_AMRNB 1
-
-#define HAVE_AMRWB 1
-#define STATIC_AMRWB 1
-#define DL_AMRWB 1
-
-#define HAVE_FLAC 1
-#define STATIC_FLAC 1
-#define FLAC__NO_DLL
-
-#define HAVE_GSM 1
-#define STATIC_GSM 1
-
-#define HAVE_ID3TAG 1
-
-#define DL_LAME 1
-
-#define HAVE_LPC10 1
-#define STATIC_LPC10 1
-
-#define HAVE_MAD_H 1
-#define DL_MAD 1
-
-#define HAVE_MP3 1
-#define STATIC_MP3 1
-
-#define HAVE_OGG_VORBIS 1
-#define STATIC_OGG_VORBIS 1
-
-#define HAVE_PNG 1
-
-#define HAVE_SNDFILE 1
-#define HAVE_SNDFILE_1_0_18 1
-#define HAVE_SFC_SET_SCALE_INT_FLOAT_WRITE 1
-#define STATIC_SNDFILE 1
-#define DL_SNDFILE 1
-
-#define HAVE_SPEEXDSP 1
-
-#define HAVE_WAVEAUDIO 1
-#define STATIC_WAVEAUDIO 1
-
-#define HAVE_WAVPACK 1
-#define HAVE_WAVPACK_H 1
-#define STATIC_WAVPACK 1
-
-#define HAVE_CONIO_H 1
-#define HAVE__FSEEKI64 1
-#define HAVE_FCNTL_H 1
-#define HAVE_IO_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_POPEN 1
-#define HAVE_SPEEXDSP 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRDUP 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIMEB_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_WIN32_GLOB_H 1
-#define HAVE_WIN32_LTDL_H 1
-
-#ifndef __cplusplus
-#define inline __inline
-#endif
--- a/msvc9/.gitignore
+++ /dev/null
@@ -1,7 +1,0 @@
-*.user
-Debug
-Makefile
-Makefile.in
-Release
-Sox.ncb
-Sox.suo
--- a/msvc9/LibFlac.vcproj
+++ /dev/null
@@ -1,296 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibFlac"
-	ProjectGUID="{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}"
-	RootNamespace="LibFlac"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../flac/src/libFLAC/include;../../flac/include;../../libogg/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__USE_3DNOW;VERSION=\&quot;1.2.0\&quot;;FLAC__NO_DLL"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../flac/src/libFLAC/include;../../flac/include;../../libogg/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;FLAC__HAS_OGG;FLAC__CPU_IA32;FLAC__USE_3DNOW;VERSION=\&quot;1.2.0\&quot;;FLAC__NO_DLL"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\flac\src\libFLAC\bitmath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\bitreader.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\bitwriter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\cpu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\crc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\fixed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\float.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\format.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\lpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\memory.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\metadata_iterators.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\metadata_object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\ogg_decoder_aspect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\ogg_encoder_aspect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\ogg_helper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\ogg_mapping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\stream_decoder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\stream_encoder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\stream_encoder_framing.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\src\libFLAC\window.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\flac\include\FLAC\all.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\assert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\callback.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\export.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\format.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\metadata.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\ordinals.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\stream_decoder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\flac\include\FLAC\stream_encoder.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibGsm.vcproj
+++ /dev/null
@@ -1,246 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibGsm"
-	ProjectGUID="{BEE9F57C-384E-4C99-87EB-629BF45C8A89}"
-	RootNamespace="LibGsm"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LTP_CUT;FAST;USE_FLOAT_MUL;WAV49;SASR"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4101;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LTP_CUT;FAST;USE_FLOAT_MUL;WAV49;SASR"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4101;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\sox\libgsm\add.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\decode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\gsm_create.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\gsm_decode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\gsm_destroy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\gsm_encode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\gsm_option.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\long_term.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\lpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\preprocess.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\rpe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\short_term.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\table.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\sox\libgsm\aliases.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\gsm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\libgsm\private.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibId3Tag.vcproj
+++ /dev/null
@@ -1,328 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibId3Tag"
-	ProjectGUID="{40EA92B6-38AA-4E67-894D-92C37C946402}"
-	RootNamespace="LibId3Tag"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../libid3tag/msvc++;../../zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4013;4018;4146;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../libid3tag/msvc++;../../zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4013;4018;4146;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\libid3tag\compat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\crc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\field.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\frame.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\frametype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\genre.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\latin1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\render.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\ucs4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\utf16.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\utf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\version.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libid3tag\compat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\crc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\field.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\frame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\frametype.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\genre.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\global.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\id3tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\latin1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\parse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\render.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\ucs4.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\utf16.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\utf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libid3tag\version.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config Files"
-			>
-			<File
-				RelativePath="..\..\libid3tag\msvc++\config.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibLpc10.vcproj
+++ /dev/null
@@ -1,324 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibLpc10"
-	ProjectGUID="{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}"
-	RootNamespace="LibLpc10"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="SoX"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4146;4244;4723"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="SoX"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4146;4244;4723"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\sox\lpc10\analys.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\bsynz.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\chanwr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\dcbias.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\decode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\deemp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\difmag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\dyptrk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\encode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\energy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\f2clib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\ham84.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\hp100.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\invert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\irc2pc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\ivfilt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\lpcdec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\lpcenc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\lpcini.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\lpfilt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\median.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\mload.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\onset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\pitsyn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\placea.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\placev.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\preemp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\prepro.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\random.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\rcchk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\synths.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\tbdm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\voicin.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\vparms.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\sox\lpc10\f2c.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sox\lpc10\lpc10.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibMad.vcproj
+++ /dev/null
@@ -1,313 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibMad"
-	ProjectGUID="{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}"
-	RootNamespace="LibMad"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="Mad;../../libmad"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4018;4146;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).dll"
-				ModuleDefinitionFile="Mad/LibMad.def"
-				GenerateDebugInformation="true"
-				SetChecksum="true"
-				ImportLibrary="$(OutDir)$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="Mad;../../libmad"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4018;4146;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="Mad/LibMad.def"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				SetChecksum="true"
-				ImportLibrary="$(OutDir)$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<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="..\..\libmad\bit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\decoder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\fixed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\frame.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\huffman.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\layer12.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\layer3.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Mad\LibMad.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\stream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\synth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\version.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libmad\bit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\decoder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\fixed.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\frame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\global.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\huffman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\layer12.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\layer3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\mad.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\synth.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libmad\version.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config Files"
-			>
-			<File
-				RelativePath=".\Mad\config.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibMp3Lame.vcproj
+++ /dev/null
@@ -1,467 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibMp3Lame"
-	ProjectGUID="{4DFD6FD1-96F1-434A-AC69-01783B876354}"
-	RootNamespace="LibMp3Lame"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="Mp3Lame;../../lame;../../lame/include;../../lame/libmp3lame;../../lame/mpglib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).dll"
-				ModuleDefinitionFile="..\..\lame\include\lame.def"
-				GenerateDebugInformation="true"
-				SetChecksum="true"
-				ImportLibrary="$(OutDir)$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="Mp3Lame;../../lame;../../lame/include;../../lame/libmp3lame;../../lame/mpglib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="..\..\lame\include\lame.def"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				SetChecksum="true"
-				ImportLibrary="$(OutDir)$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<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="..\..\lame\libmp3lame\bitstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\dct64_i386.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\decode_i386.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\encoder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\fft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\gain_analysis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\id3tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\interface.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\lame.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\include\lame.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\layer1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\layer2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\layer3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\mpglib_interface.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\newmdct.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\presets.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\psymodel.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\quantize.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\quantize_pvt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\reservoir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\set_get.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\tabinit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\tables.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\takehiro.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\vbrquantize.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\VbrTag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\version.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\lame\libmp3lame\bitstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\configMS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\dct64_i386.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\decode_i386.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\encoder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\fft.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\gain_analysis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\huffman.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\id3tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\interface.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\l2tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\l3side.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\lame-analysis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\include\lame.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\lame_global_flags.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\lameerror.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\layer1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\layer2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\layer3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\machine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\mpg123.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\mpglib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\newmdct.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\psymodel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\quantize.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\quantize_pvt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\reservoir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\set_get.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\mpglib\tabinit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\tables.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\vbrquantize.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\VbrTag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\lame\libmp3lame\version.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config Files"
-			>
-			<File
-				RelativePath=".\Mp3Lame\config.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibOgg.vcproj
+++ /dev/null
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibOgg"
-	ProjectGUID="{C5C229AC-316D-42CB-9CA3-329619618972}"
-	RootNamespace="LibOgg"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../libogg/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LIBOGG_EXPORTS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../libogg/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBOGG_EXPORTS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\libogg\src\bitwise.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libogg\src\framing.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libogg\include\ogg\ogg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libogg\include\ogg\os_types.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibPng.vcproj
+++ /dev/null
@@ -1,262 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibPng"
-	ProjectGUID="{46E7AC9D-3E96-4B34-B493-501BC277D6F9}"
-	RootNamespace="LibPng"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="Png;../../zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="Png;../../zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\libpng\png.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngerror.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngget.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngpread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngrio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngrtran.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngrutil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngtrans.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngwio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngwrite.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngwtran.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngwutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libpng\png.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libpng\pngconf.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config Files"
-			>
-			<File
-				RelativePath=".\Png\inttypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Png\pnglibconf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Png\stdint.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibSndFile.vcproj
+++ /dev/null
@@ -1,484 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibSndFile"
-	ProjectGUID="{342BDA83-C83F-4168-8425-E1DF72F47018}"
-	RootNamespace="LibSndFile"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="SndFile;..\..\libsndfile\src;../../flac/include;../../libogg/include;../../libvorbis/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSNDFILE_EXPORTS;inline=__inline"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName)-1.dll"
-				ModuleDefinitionFile="..\..\libsndfile\src\libsndfile-1.def"
-				GenerateDebugInformation="true"
-				SetChecksum="true"
-				ImportLibrary="$(OutDir)$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="SndFile;..\..\libsndfile\src;../../flac/include;../../libogg/include;../../libvorbis/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LIBSNDFILE_EXPORTS;inline=__inline"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName)-1.dll"
-				ModuleDefinitionFile="..\..\libsndfile\src\libsndfile-1.def"
-				GenerateDebugInformation="true"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				SetChecksum="true"
-				ImportLibrary="$(OutDir)$(TargetName).lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<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="..\..\libsndfile\src\aiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\alaw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\au.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\audio_detect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\avr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\broadcast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\caf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\chanmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\chunk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\command.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\common.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\dither.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\double64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\dwd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\dwvw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\file_io.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\flac.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\float32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\g72x.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\gsm610.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\htk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\id3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ima_adpcm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ima_oki_adpcm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\interleave.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ircam.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\macbinary3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\macos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\mat4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\mat5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\mpc2k.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ms_adpcm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\nist.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ogg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\paf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\pcm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\pvf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\raw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\rf64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\rx2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\sd2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\sds.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\sndfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\strings.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\svx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\txw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ulaw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\voc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\vox_adpcm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\w64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\wav.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\wav_w64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\windows.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\wve.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\xi.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libsndfile\src\common.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g72x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g72x_priv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm610_priv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\ima_oki_adpcm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\sf_unistd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\sfconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\sfendian.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\test_main.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\wav_w64.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config files"
-			>
-			<File
-				RelativePath="SndFile\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\libsndfile-1.def"
-				>
-			</File>
-			<File
-				RelativePath="SndFile\sndfile.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibSndFileG72x.vcproj
+++ /dev/null
@@ -1,202 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibSndFileG72x"
-	ProjectGUID="{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}"
-	RootNamespace="G72x"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\libsndfile\src\G72x\g721.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g723_16.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g723_24.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g723_40.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g72x.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g72x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\G72x\g72x_priv.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibSndFileGSM610.vcproj
+++ /dev/null
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibSndFileGSM610"
-	ProjectGUID="{D2572DE1-610E-46A4-8DD2-8A693347D76A}"
-	RootNamespace="GSM610"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;inline=__inline"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;inline=__inline"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\libsndfile\src\GSM610\add.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\decode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm_create.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm_decode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm_destroy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm_encode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm_option.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\long_term.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\lpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\preprocess.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\rpe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\short_term.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\table.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libsndfile\src\GSM610\gsm610_priv.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibSoX.vcproj
+++ /dev/null
@@ -1,1208 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibSoX"
-	ProjectGUID="{F17BE535-C7E8-4930-A6FD-32498D73A533}"
-	RootNamespace="LibSoX"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="SoX;Png;../../flac/include;../../lame/include;../../lame;../../libid3tag;../../libmad;../../libpng;../../libogg/include;sndfile;../../speex/include;../../libvorbis/include;../../wavpack/include;../../wavpack;../../zlib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Headers"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\src\adpcm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\adpcms.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\aiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\amr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\band.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\biquad.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\compandt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cvsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cvsdfilt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dft_filter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dither.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\effects.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fft4g.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fifo.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\formats.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g711.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g72x.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ima_rw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mcompand_xover.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mp3-util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\noisered.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\rate_filters.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\rate_half_fir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\rate_poly_fir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\rate_poly_fir0.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\raw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sox_i.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sox_sample_test.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\soxomp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\vox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\win32-ltdl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\xmalloc.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Config Headers"
-			>
-			<File
-				RelativePath=".\SoX\soxconfig.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Excluded Sources"
-			>
-			<File
-				RelativePath="..\src\alsa.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\ao.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\coreaudio.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\example0.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\example1.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\example2.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\example3.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\example4.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\oss.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\pulseaudio.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\skeleff.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\skelform.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\sndio.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\sox_sample_test.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\sunaudio.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Effect Sources"
-			>
-			<File
-				RelativePath="..\src\bend.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\biquad.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\biquads.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\chorus.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\compand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\compandt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\contrast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dcshift.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\delay.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dft_filter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dither.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\divide.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\downsample.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\earwax.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\echo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\echos.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fade.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\firfit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\flanger.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\gain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\hilbert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\input.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ladspa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\loudness.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mcompand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\noiseprof.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\noisered.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\output.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\overdrive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\pad.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\phaser.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\rate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\remix.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\repeat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\reverb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\reverse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\silence.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sinc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\spectrogram.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\speed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\speexdsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\splice.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\stat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\stats.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\stretch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\swap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\synth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\tempo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\tremolo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\trim.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\upsample.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\vad.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\vol.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Format Sources"
-			>
-			<File
-				RelativePath="..\src\8svx.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\aifc-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\aiff-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\al-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\amr-nb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\amr-wb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\au.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\avr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\caf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cdr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cvsd-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\dvms-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\f4-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\f8-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\flac.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\gsm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\gsrt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\hcom.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\htk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ima-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ima_rw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\la-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\lpc10.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\lu-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mat4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mat5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\maud.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\mp3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\nulfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\paf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\prc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\pvf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\raw-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\s1-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\s2-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\s3-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\s4-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sd2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\smp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sndfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sounder.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\soundtool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sox-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\sphere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\tx16w.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\u1-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\u2-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\u3-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\u4-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\ul-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\voc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\vorbis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\vox-fmt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\vox.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\w64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\wav.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\waveaudio.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\wavpack.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						DisableSpecificWarnings="4142"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						DisableSpecificWarnings="4142"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\wve.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\xa.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\xi.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Shared Sources"
-			>
-			<File
-				RelativePath="..\src\adpcm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\adpcms.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\aiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\cvsd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\effects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\effects_i.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\effects_i_dsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\fft4g.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\formats.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\formats_i.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g711.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g721.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g723_24.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g723_40.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\g72x.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\libsox.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\libsox_i.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\raw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\util.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\win32-ltdl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\xmalloc.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibSpeex.vcproj
+++ /dev/null
@@ -1,452 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibSpeex"
-	ProjectGUID="{60902B83-8B26-4DBD-B635-4CECF5F4744C}"
-	RootNamespace="LibSpeex"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../speex/include;../../speex/win32"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;M_PI=3.14159265358979323846"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4018;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../speex/include;../../speex/win32"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;M_PI=3.14159265358979323846"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4018;4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\speex\libspeex\bits.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\cb_search.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\exc_10_16_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\exc_10_32_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\exc_20_32_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\exc_5_256_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\exc_5_64_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\exc_8_128_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\fftwrap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\filterbank.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\filters.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\gain_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\gain_table_lbr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\hexc_10_32_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\hexc_table.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\high_lsp_tables.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\jitter.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\kiss_fft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\kiss_fftr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\lpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\lsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\lsp_tables_nb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\ltp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\mdf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\modes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\modes_wb.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\nb_celp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\preprocess.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\quant_lsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\sb_celp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\scal.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\smallft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\speex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\speex_callbacks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\speex_header.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\stereo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\vbr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\vq.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\window.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\speex\libspeex\cb_search.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\cb_search_sse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\win32\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\fftwrap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\filterbank.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\filters.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\filters_sse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\fixed_bfin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\fixed_debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\fixed_generic.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\kiss_fft.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\kiss_fftr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\lpc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\lsp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\ltp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\ltp_sse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\math_approx.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\modes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\nb_celp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\os_support.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\pseudofloat.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\quant_lsp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\resample_sse.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\sb_celp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\smallft.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\stack_alloc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\vbr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\vorbis_psy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\vq.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\speex\libspeex\vq_sse.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibVorbis.vcproj
+++ /dev/null
@@ -1,340 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibVorbis"
-	ProjectGUID="{524A24CD-0973-4733-8EB9-F419DC6F9997}"
-	RootNamespace="LibVorbis"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../libogg/include;../../libvorbis/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LIBVORBIS_EXPORTS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4554"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../libogg/include;../../libvorbis/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;LIBVORBIS_EXPORTS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4244;4554"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\libvorbis\lib\analysis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\bitrate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\block.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\codebook.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\envelope.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\floor0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\floor1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\info.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lookup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\mapping0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\mdct.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\psy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\registry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\res0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\sharedbook.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\smallft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\synthesis.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\vorbisenc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\vorbisfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\window.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\libvorbis\lib\backends.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\bitrate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\codebook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\codec_internal.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\envelope.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\highlevel.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lookup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lookup_data.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lpc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\lsp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\masking.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\mdct.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\misc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\os.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\psy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\registry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\scales.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\smallft.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\libvorbis\lib\window.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibWavPack.vcproj
+++ /dev/null
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibWavPack"
-	ProjectGUID="{7461CC57-B1CB-4766-B357-F51587449474}"
-	RootNamespace="LibWavPack"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPT_MMX"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPT_MMX"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\wavpack\src\bits.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\extra1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\extra2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\float.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\metadata.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\tags.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\unpack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\unpack3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\words.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\wputils.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\wavpack\src\unpack3.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\include\wavpack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\wavpack_local.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\wavpack\src\wavpack_version.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/LibZLib.vcproj
+++ /dev/null
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="LibZLib"
-	ProjectGUID="{90D19FCF-8560-4396-A250-DDF74D1B0E36}"
-	RootNamespace="LibZLib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				WarnAsError="true"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<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="..\..\zlib\adler32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\compress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\crc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\deflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\infback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inffast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inflate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inftrees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\uncompr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\zutil.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\zlib\crc32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\deflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inffast.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inffixed.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inflate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\inftrees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\zconf.in.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\zlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\zlib\zutil.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/Mad/LibMad.def
+++ /dev/null
@@ -1,60 +1,0 @@
-; libSoX libmad export definitions for MSVC9: (c) 2009 SoX contributors
-;
-; This library is free software; you can redistribute it and/or modify it
-; under the terms of the GNU Lesser General Public License as published by
-; the Free Software Foundation; either version 2.1 of the License, or (at
-; your option) any later version.
-;
-; This library is distributed in the hope that it will be useful, but
-; WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
-; General Public License for more details.
-;
-; You should have received a copy of the GNU Lesser General Public License
-; along with this library; if not, write to the Free Software Foundation,
-; Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-;
-
-EXPORTS
-
-    mad_bit_crc
-    mad_bit_init
-    mad_bit_length
-    mad_bit_nextbyte
-    mad_bit_read
-    mad_bit_skip
-    
-    mad_decoder_init
-    mad_decoder_finish
-    mad_decoder_message
-    mad_decoder_run
-    
-    mad_frame_decode
-    mad_frame_finish
-    mad_frame_init
-    mad_frame_mute
-    
-    mad_header_decode
-    mad_header_init
-    
-    mad_stream_buffer
-    mad_stream_errorstr
-    mad_stream_finish
-    mad_stream_init
-    mad_stream_skip
-    mad_stream_sync
-    
-    mad_synth_frame
-    mad_synth_init
-    mad_synth_mute
-    
-    mad_timer_abs
-    mad_timer_add
-    mad_timer_compare
-    mad_timer_count
-    mad_timer_fraction
-    mad_timer_multiply
-    mad_timer_negate
-    mad_timer_set
-    mad_timer_string
-    mad_timer_zero
--- a/msvc9/Mad/config.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/* libSoX libmad config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <msvc++/config.h>
-#define FPM_INTEL
--- a/msvc9/Makefile.am
+++ /dev/null
@@ -1,30 +1,0 @@
-EXTRA_DIST= \
-    LibFlac.vcproj \
-	LibGsm.vcproj \
-	LibId3Tag.vcproj \
-	LibLpc10.vcproj \
-	LibMad.vcproj \
-	LibMp3Lame.vcproj \
-	LibOgg.vcproj \
-	LibPng.vcproj \
-	LibSndFileG72x.vcproj \
-   	LibSndFileGSM610.vcproj \
-	LibSndFile.vcproj \
-	LibSoX.vcproj \
-	LibSpeex.vcproj \
-	LibVorbis.vcproj \
-	LibWavPack.vcproj \
-	LibZLib.vcproj \
-	Readme.txt \
-	Sox.sln \
-	SoX.vcproj \
-	Mad/config.h \
-	Mad/LibMad.def \
-	Mp3Lame/config.h \
-	Png/inttypes.h \
-	Png/pnglibconf.h \
-	SndFile/config.h \
-	SndFile/inttypes.h \
-	SndFile/sndfile.h \
-	SndFile/sys/time.h \
-	Sox/soxconfig.h
--- a/msvc9/Mp3Lame/config.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/* libSoX libmp3lame config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define HAVE_MPGLIB 1
-#include <configMS.h>
--- a/msvc9/Png/inttypes.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libpng stub file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Nothing here. */
--- a/msvc9/Png/pnglibconf.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libpng config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "../../../libpng/scripts/pnglibconf.h.prebuilt"
\ No newline at end of file
--- a/msvc9/Readme.txt
+++ /dev/null
@@ -1,82 +1,0 @@
-This directory includes hand-crafted project files for building SoX under
-MSVC9. The project files may be replaced by expanding CMAKE support in the
-future, but for now, this is the easiest way to build SoX with MS Visual C++.
-The resulting sox.exe has support for all SoX features except magic, and
-pulseaudio. LAME (libmp3lame.dll or lame_enc.dll), MAD (libmad.dll or
-cygmad-0.dll), libsndfile (libsndfile-1.dll) and AMR support (libamrnb-3.dll,
-libamrwb-3.dll) are loaded at runtime if they are available.
-
-How to build:
-
-1. Check out the SoX git code into a directory named sox.
-
-2. Extract the source code for the other libraries next to the sox
-   directory. Remove the version numbers from the directory names.
-   The following versions were tested and successfully built:
-   -- flac-1.2.1.tar.gz extracted into directory flac
-   -- lame-398.4.tar.gz extracted into directory lame
-   -- libid3tag-0.15.1b.tar.gz extracted into directory libid3tag
-   -- libmad-0.15.1b.tar.gz extracted into directory libmad
-   -- libogg-1.2.2.tar.gz extracted into directory libogg
-   -- libpng-1.5.1.tar.gz extracted into directory libpng
-   -- libsndfile-1.0.23.tar.gz extracted into directory libsndfile
-   -- libvorbis-1.3.2.tar.gz extracted into directory libvorbis
-   -- speex-1.2rc1.tar.gz extracted into directory speex
-   -- wavpack-4.60.1.tar.bz2 extracted into directory wavpack
-   -- zlib-1.2.5.tar.gz extracted into directory zlib
-
-3. Open the sox\msvc9\SoX.sln solution.
-
-4. If any of the above libraries are not available or not wanted, adjust the
-   corresponding settings in the soxconfig.h file (in the LibSoX project inside
-   the Config Files folder) and remove the corresponding project from the
-   solution.
-
-5. Build the solution.
-
-6. The resulting executable files will be in sox\msvc9\Debug or
-   sox\msvc9\Release. The resulting sox.exe will dynamically link to
-   libmp3lame.dll, libmad.dll, libsndfile-1.dll, libamrnb-3.dll, and
-   libamrwb-3.dll if they are available, but will run without them (though the
-   corresponding features will be unavailable if they are not present).
-
-Points to note:
-
-- The libsndfile-1.0.20.tar.gz package does not include the sndfile.h header
-  file. Normally, before compiling libsndfile, you would create sndfile.h
-  (either by processing it via autoconf, by downloading a copy, or by renaming
-  sndfile.h.in). However, this SoX solution includes its own version of
-  sndfile.h, so you should not create a sndfile.h under the libsndfile folder.
-  To repeat: you should extract a clean copy of libsndfile-1.0.20.tar.gz, and
-  should not add, process, or rename any files.
-
-- The solution includes an experimental effect called speexdsp that uses the
-  speex DSP library. This does not yet enable any support for the speex file
-  format or speex codec. The speexdsp effect is simply an experimental effect
-  to make use of the automatic gain control and noise filtering components that
-  are part of the speex codec package. Support for the speex codec may be added
-  later.
-
-- The included projects do not enable SSE2. You can enable this in the project
-  properties under Configuration Properties, C/C++, Code Generation, Enable
-  Enhanced Instruction Set. Note that some editions of Visual Studio might
-  not include Enhanced Instruction Set support.
-
-- The included projects set the floating-point model to "fast". This means
-  that the compiler is free to optimize floating-point operations. For
-  example, the compiler might optimize the expression (14.0 * x / 7.0) into
-  (x * 2.0). In addition, the compiler is allowed to leave expression results
-  in floating-point registers to store temporary values instead of rounding
-  each intermediate result to a 32-bit or 64-bit value. In some cases, these
-  optimizations can change the results of floating-point calculations. If you
-  need more precise results, you can change this optimization setting can be
-  changed to one of the other values. The "precise" setting avoids any
-  optimization that might change the result (preserves the order of all
-  operations) but keeps optimizations that might give more accurate results
-  (such as using more precision than necessary for intermediate values if doing
-  so results in faster code). The "strict" setting avoids any optimization that
-  might change the result in any way contrary to the C/C++ standard and rounds
-  every intermediate result to the requested precision according to standard
-  floating-point rounding rules. You can change this setting in the project
-  properties under Configuration Properties, C/C++, Code Generation, Floating
-  Point Model.
--- a/msvc9/SndFile/config.h
+++ /dev/null
@@ -1,303 +1,0 @@
-/* libSoX libsndfile config for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define inline __inline
-typedef __int64 __int64_t;
-typedef __int64 int64_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int16 uint16_t;
-#define ptrdiff_t ssize_t
-#define snprintf _snprintf
-#define __func__ __FUNCTION__
-#define FLAC__NO_DLL
-#define lrint(f)  ((long)(f))
-#define lrintf(f) lrint(f)
-
-/* Set to 1 if the compile is GNU GCC. */
-#undef COMPILER_IS_GCC
-
-/* Target processor clips on negative float to int conversion. */
-#define CPU_CLIPS_NEGATIVE 0
-
-/* Target processor clips on positive float to int conversion. */
-#define CPU_CLIPS_POSITIVE 0
-
-/* Target processor is big endian. */
-#define CPU_IS_BIG_ENDIAN 0
-
-/* Target processor is little endian. */
-#define CPU_IS_LITTLE_ENDIAN 1
-
-/* Set to 1 to enable experimental code. */
-#undef ENABLE_EXPERIMENTAL_CODE
-
-/* Define to 1 if you have the <alsa/asoundlib.h> header file. */
-#undef HAVE_ALSA_ASOUNDLIB_H
-
-/* Define to 1 if you have the <byteswap.h> header file. */
-#undef HAVE_BYTESWAP_H
-
-/* Define to 1 if you have the `calloc' function. */
-#define HAVE_CALLOC 1
-
-/* Define to 1 if you have the `ceil' function. */
-#define HAVE_CEIL 1
-
-/* Set to 1 if S_IRGRP is defined. */
-#undef HAVE_DECL_S_IRGRP
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <endian.h> header file. */
-#undef HAVE_ENDIAN_H
-
-/* Will be set to 1 if flac, ogg and vorbis are available. */
-#define HAVE_EXTERNAL_LIBS 1
-
-/* Set to 1 if the compile supports the struct hack. */
-#define HAVE_FLEXIBLE_ARRAY 1
-
-/* Define to 1 if you have the `floor' function. */
-#define HAVE_FLOOR 1
-
-/* Define to 1 if you have the `fmod' function. */
-#define HAVE_FMOD 1
-
-/* Define to 1 if you have the `free' function. */
-#define HAVE_FREE 1
-
-/* Define to 1 if you have the `fstat' function. */
-#define HAVE_FSTAT 1
-
-/* Define to 1 if you have the `fsync' function. */
-#undef HAVE_FSYNC
-
-/* Define to 1 if you have the `ftruncate' function. */
-#undef HAVE_FTRUNCATE
-
-/* Define to 1 if you have the `getpagesize' function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define to 1 if you have the `gmtime' function. */
-#define HAVE_GMTIME 1
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Set to 1 if you have JACK. */
-#undef HAVE_JACK
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `localtime' function. */
-#define HAVE_LOCALTIME 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the `lseek' function. */
-#define HAVE_LSEEK 1
-
-/* Define to 1 if you have the `malloc' function. */
-#define HAVE_MALLOC 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mmap' function. */
-#undef HAVE_MMAP
-
-/* Define to 1 if you have the `open' function. */
-#define HAVE_OPEN 1
-
-/* Define to 1 if you have the `pread' function. */
-#undef HAVE_PREAD
-
-/* Define to 1 if you have the `pwrite' function. */
-#undef HAVE_PWRITE
-
-/* Define to 1 if you have the `read' function. */
-#define HAVE_READ 1
-
-/* Define to 1 if you have the `realloc' function. */
-#define HAVE_REALLOC 1
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Set to 1 if you have libsqlite3. */
-#undef HAVE_SQLITE3
-
-/* Define to 1 if the system has the type `ssize_t'. */
-#undef HAVE_SSIZE_T
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Set to 1 if we have vorbis_version_string. */
-#undef HAVE_VORBIS_VERSION_STRING
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#define HAVE_VSNPRINTF 1
-
-/* Define to 1 if you have the `write' function. */
-#define HAVE_WRITE 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Set to 1 if compiling for MacOSX */
-#undef OS_IS_MACOSX
-
-/* Set to 1 if compiling for Win32 */
-#define OS_IS_WIN32 1
-
-/* Name of package */
-#define PACKAGE "libsndfile"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "erikd@mega-nerd.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libsndfile"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libsndfile 1.0.20"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libsndfile"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.20"
-
-/* Set to maximum allowed value of sf_count_t type. */
-//#define SF_COUNT_MAX (9223372036854775807i64)
-
-/* The size of `double', as computed by sizeof. */
-#define SIZEOF_DOUBLE (8)
-
-/* The size of `float', as computed by sizeof. */
-#define SIZEOF_FLOAT (4)
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT (4)
-
-/* The size of `int64_t', as computed by sizeof. */
-#define SIZEOF_INT64_T (8)
-
-/* The size of `loff_t', as computed by sizeof. */
-#undef SIZEOF_LOFF_T
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG (4)
-
-/* The size of `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG (8)
-
-/* The size of `off64_t', as computed by sizeof. */
-#undef SIZEOF_OFF64_T
-
-/* The size of `off_t', as computed by sizeof. */
-#define SIZEOF_OFF_T (4)
-
-/* Set to sizeof (long) if unknown. */
-#define SIZEOF_SF_COUNT_T (8)
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT (2)
-
-/* The size of `size_t', as computed by sizeof. */
-#define SIZEOF_SIZE_T (4)
-
-/* The size of `ssize_t', as computed by sizeof. */
-#undef SIZEOF_SSIZE_T
-
-/* The size of `void*', as computed by sizeof. */
-#define SIZEOF_VOIDP (4)
-
-/* The size of `wchar_t', as computed by sizeof. */
-#define SIZEOF_WCHAR_T (2)
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Set to long if unknown. */
-#define TYPEOF_SF_COUNT_T __int64
-
-/* Set to 1 to use the native windows API */
-#define USE_WINDOWS_API 1
-
-/* Version number of package */
-#define VERSION "1.0.20"
-
-/* Set to 1 if windows DLL is being built. */
-#define WIN32_TARGET_DLL 1
-
-/* Target processor is big endian. */
-#undef WORDS_BIGENDIAN
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to make fseeko etc. visible, on some hosts. */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
--- a/msvc9/SndFile/inttypes.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libpng stub file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#define PRId64 "lld"
--- a/msvc9/SndFile/sndfile.h
+++ /dev/null
@@ -1,19 +1,0 @@
-/* libSoX libsndfile wrapper for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-typedef __int64 __int64_t;
-#include "../../libsndfile/src/sndfile.h.in"
--- a/msvc9/SndFile/sys/time.h
+++ /dev/null
@@ -1,18 +1,0 @@
-/* libSoX libsndfile stub file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Nothing here. */
--- a/msvc9/SoX.vcproj
+++ /dev/null
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="SoX"
-	ProjectGUID="{AC136601-504C-4E1A-9DC8-0CC493AA0983}"
-	RootNamespace="SoX"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="SoX"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SOX_IMPORT;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(OutDir)libzlib.lib winmm.lib"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).exe"
-				DelayLoadDLLs="winmm.dll"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="0"
-				SetChecksum="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)\lib\"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="SoX"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SOX_IMPORT;_CRT_SECURE_NO_WARNINGS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				DisableSpecificWarnings="4244"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(OutDir)libzlib.lib winmm.lib"
-				OutputFile="$(SolutionDir)$(ConfigurationName)\$(ProjectName).exe"
-				LinkIncremental="1"
-				DelayLoadDLLs="winmm.dll"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				SetChecksum="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-		</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="..\src\sox.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\win32-glob.c"
-				>
-			</File>
-			<File
-				RelativePath="..\src\win32-glob.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/msvc9/Sox.sln
+++ /dev/null
@@ -1,139 +1,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSoX", "LibSoX.vcproj", "{F17BE535-C7E8-4930-A6FD-32498D73A533}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SoX", "SoX.vcproj", "{AC136601-504C-4E1A-9DC8-0CC493AA0983}"
-	ProjectSection(ProjectDependencies) = postProject
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0} = {38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85} = {C588FF17-FB2F-48D9-BB99-40B6D52B9B85}
-		{F17BE535-C7E8-4930-A6FD-32498D73A533} = {F17BE535-C7E8-4930-A6FD-32498D73A533}
-		{7461CC57-B1CB-4766-B357-F51587449474} = {7461CC57-B1CB-4766-B357-F51587449474}
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89} = {BEE9F57C-384E-4C99-87EB-629BF45C8A89}
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C} = {60902B83-8B26-4DBD-B635-4CECF5F4744C}
-		{342BDA83-C83F-4168-8425-E1DF72F47018} = {342BDA83-C83F-4168-8425-E1DF72F47018}
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9} = {46E7AC9D-3E96-4B34-B493-501BC277D6F9}
-		{C5C229AC-316D-42CB-9CA3-329619618972} = {C5C229AC-316D-42CB-9CA3-329619618972}
-		{40EA92B6-38AA-4E67-894D-92C37C946402} = {40EA92B6-38AA-4E67-894D-92C37C946402}
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301} = {7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}
-		{524A24CD-0973-4733-8EB9-F419DC6F9997} = {524A24CD-0973-4733-8EB9-F419DC6F9997}
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36} = {90D19FCF-8560-4396-A250-DDF74D1B0E36}
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A} = {D2572DE1-610E-46A4-8DD2-8A693347D76A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibFlac", "LibFlac.vcproj", "{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibGsm", "LibGsm.vcproj", "{BEE9F57C-384E-4C99-87EB-629BF45C8A89}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibLpc10", "LibLpc10.vcproj", "{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibMad", "LibMad.vcproj", "{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibMp3Lame", "LibMp3Lame.vcproj", "{4DFD6FD1-96F1-434A-AC69-01783B876354}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOgg", "LibOgg.vcproj", "{C5C229AC-316D-42CB-9CA3-329619618972}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibPng", "LibPng.vcproj", "{46E7AC9D-3E96-4B34-B493-501BC277D6F9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibWavPack", "LibWavPack.vcproj", "{7461CC57-B1CB-4766-B357-F51587449474}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibVorbis", "LibVorbis.vcproj", "{524A24CD-0973-4733-8EB9-F419DC6F9997}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibZLib", "LibZLib.vcproj", "{90D19FCF-8560-4396-A250-DDF74D1B0E36}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibId3Tag", "LibId3Tag.vcproj", "{40EA92B6-38AA-4E67-894D-92C37C946402}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSndFileG72x", "LibSndFileG72x.vcproj", "{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSndFileGSM610", "LibSndFileGSM610.vcproj", "{D2572DE1-610E-46A4-8DD2-8A693347D76A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSndFile", "LibSndFile.vcproj", "{342BDA83-C83F-4168-8425-E1DF72F47018}"
-	ProjectSection(ProjectDependencies) = postProject
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0} = {38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}
-		{C5C229AC-316D-42CB-9CA3-329619618972} = {C5C229AC-316D-42CB-9CA3-329619618972}
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301} = {7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}
-		{524A24CD-0973-4733-8EB9-F419DC6F9997} = {524A24CD-0973-4733-8EB9-F419DC6F9997}
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A} = {D2572DE1-610E-46A4-8DD2-8A693347D76A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibSpeex", "LibSpeex.vcproj", "{60902B83-8B26-4DBD-B635-4CECF5F4744C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Debug|Win32.Build.0 = Debug|Win32
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Release|Win32.ActiveCfg = Release|Win32
-		{F17BE535-C7E8-4930-A6FD-32498D73A533}.Release|Win32.Build.0 = Release|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Debug|Win32.Build.0 = Debug|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Release|Win32.ActiveCfg = Release|Win32
-		{AC136601-504C-4E1A-9DC8-0CC493AA0983}.Release|Win32.Build.0 = Release|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Debug|Win32.Build.0 = Debug|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Release|Win32.ActiveCfg = Release|Win32
-		{38203D05-AF71-4FF2-A183-A7D9CB8D2AE0}.Release|Win32.Build.0 = Release|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Debug|Win32.Build.0 = Debug|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Release|Win32.ActiveCfg = Release|Win32
-		{BEE9F57C-384E-4C99-87EB-629BF45C8A89}.Release|Win32.Build.0 = Release|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Debug|Win32.Build.0 = Debug|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Release|Win32.ActiveCfg = Release|Win32
-		{C588FF17-FB2F-48D9-BB99-40B6D52B9B85}.Release|Win32.Build.0 = Release|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Debug|Win32.Build.0 = Debug|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Release|Win32.ActiveCfg = Release|Win32
-		{B7A8AD9A-0D07-4453-B2DE-FEABD9546263}.Release|Win32.Build.0 = Release|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Debug|Win32.Build.0 = Debug|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Release|Win32.ActiveCfg = Release|Win32
-		{4DFD6FD1-96F1-434A-AC69-01783B876354}.Release|Win32.Build.0 = Release|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Debug|Win32.Build.0 = Debug|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Release|Win32.ActiveCfg = Release|Win32
-		{C5C229AC-316D-42CB-9CA3-329619618972}.Release|Win32.Build.0 = Release|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Debug|Win32.Build.0 = Debug|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Release|Win32.ActiveCfg = Release|Win32
-		{46E7AC9D-3E96-4B34-B493-501BC277D6F9}.Release|Win32.Build.0 = Release|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Debug|Win32.Build.0 = Debug|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Release|Win32.ActiveCfg = Release|Win32
-		{7461CC57-B1CB-4766-B357-F51587449474}.Release|Win32.Build.0 = Release|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Debug|Win32.ActiveCfg = Debug|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Debug|Win32.Build.0 = Debug|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Release|Win32.ActiveCfg = Release|Win32
-		{524A24CD-0973-4733-8EB9-F419DC6F9997}.Release|Win32.Build.0 = Release|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Debug|Win32.Build.0 = Debug|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Release|Win32.ActiveCfg = Release|Win32
-		{90D19FCF-8560-4396-A250-DDF74D1B0E36}.Release|Win32.Build.0 = Release|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Debug|Win32.Build.0 = Debug|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Release|Win32.ActiveCfg = Release|Win32
-		{40EA92B6-38AA-4E67-894D-92C37C946402}.Release|Win32.Build.0 = Release|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Debug|Win32.Build.0 = Debug|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Release|Win32.ActiveCfg = Release|Win32
-		{7016D4C2-A0AB-4BFD-9AA1-4ECDCCBE6301}.Release|Win32.Build.0 = Release|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Debug|Win32.Build.0 = Debug|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Release|Win32.ActiveCfg = Release|Win32
-		{D2572DE1-610E-46A4-8DD2-8A693347D76A}.Release|Win32.Build.0 = Release|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Debug|Win32.ActiveCfg = Debug|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Debug|Win32.Build.0 = Debug|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Release|Win32.ActiveCfg = Release|Win32
-		{342BDA83-C83F-4168-8425-E1DF72F47018}.Release|Win32.Build.0 = Release|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Debug|Win32.Build.0 = Debug|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Release|Win32.ActiveCfg = Release|Win32
-		{60902B83-8B26-4DBD-B635-4CECF5F4744C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/msvc9/Sox/soxconfig.h
+++ /dev/null
@@ -1,97 +1,0 @@
-/* libSoX config file for MSVC9: (c) 2009 SoX contributors
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-/* Used only by sox.c: */
-#define MORE_INTERACTIVE
-
-#define PACKAGE_EXTRA "msvc"
-
-/* Special behavior defined by win32-ltdl: "./" is replaced with the name of the
-   directory containing sox.exe. */
-#define PKGLIBDIR "./soxlib"
-
-#define HAVE_AMRNB 1
-#define STATIC_AMRNB 1
-#define DL_AMRNB 1
-
-#define HAVE_AMRWB 1
-#define STATIC_AMRWB 1
-#define DL_AMRWB 1
-
-#define HAVE_FLAC 1
-#define STATIC_FLAC 1
-#define FLAC__NO_DLL
-
-#define HAVE_GSM 1
-#define STATIC_GSM 1
-
-#define HAVE_ID3TAG 1
-
-#define DL_LAME 1
-
-#define HAVE_LPC10 1
-#define STATIC_LPC10 1
-
-#define HAVE_MAD_H 1
-#define DL_MAD 1
-
-#define HAVE_MP3 1
-#define STATIC_MP3 1
-
-#define HAVE_OGG_VORBIS 1
-#define STATIC_OGG_VORBIS 1
-
-#define HAVE_PNG 1
-
-#define HAVE_SNDFILE 1
-#define HAVE_SNDFILE_1_0_12 1
-#define HAVE_SNDFILE_1_0_18 1
-#define HAVE_SNDFILE_H 1
-#define HAVE_SFC_SET_SCALE_FLOAT_INT_READ 1
-#define HAVE_SFC_SET_SCALE_INT_FLOAT_WRITE 1
-#define STATIC_SNDFILE 1
-#define DL_SNDFILE 1
-
-#define HAVE_SPEEXDSP 1
-
-#define HAVE_WAVEAUDIO 1
-#define STATIC_WAVEAUDIO 1
-
-#define HAVE_WAVPACK 1
-#define HAVE_WAVPACK_H 1
-#define STATIC_WAVPACK 1
-
-#define HAVE_CONIO_H 1
-#define HAVE__FSEEKI64 1
-#define HAVE_FCNTL_H 1
-#define HAVE_IO_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_POPEN 1
-#define HAVE_SPEEXDSP 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRDUP 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TIMEB_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_WIN32_GLOB_H 1
-#define HAVE_WIN32_LTDL_H 1
-
-#ifndef __cplusplus
-#define inline __inline
-#endif