diff --git a/win/Projects/Audacity/Audacity.vcxproj b/win/Projects/Audacity/Audacity.vcxproj
index e91a025d8..c21a59343 100755
--- a/win/Projects/Audacity/Audacity.vcxproj
+++ b/win/Projects/Audacity/Audacity.vcxproj
@@ -1186,6 +1186,12 @@
       <Project>{a52bbea5-8b02-4147-8734-5d9bbf4d1177}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\libmp3lame\libmp3lame.vcxproj">
+      <Project>{20536101-3b0e-43ef-94f9-080d595dac57}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\libmpg123\libmpg123.vcxproj">
+      <Project>{e2dab91a-8248-4625-8a85-2c2c2a390dd8}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\libnyquist\libnyquist.vcxproj">
       <Project>{7aa41bed-41b0-427a-9148-dea40549d158}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/win/Projects/libmp3lame/arch_sse2.props b/win/Projects/libmp3lame/arch_sse2.props
index f1176cd8e..8fde4c24f 100644
--- a/win/Projects/libmp3lame/arch_sse2.props
+++ b/win/Projects/libmp3lame/arch_sse2.props
@@ -3,15 +3,11 @@
   <ImportGroup Label="PropertySheets">
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win/Projects/libmp3lame/arch_x87.props b/win/Projects/libmp3lame/arch_x87.props
deleted file mode 100644
index a6ef87bf1..000000000
--- a/win/Projects/libmp3lame/arch_x87.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>TAKEHIRO_IEEE754_HACK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/win/Projects/libmp3lame/libmp3lame.vcxproj b/win/Projects/libmp3lame/libmp3lame.vcxproj
index 60f769832..ce4adb95a 100644
--- a/win/Projects/libmp3lame/libmp3lame.vcxproj
+++ b/win/Projects/libmp3lame/libmp3lame.vcxproj
@@ -9,10 +9,6 @@
       <Configuration>ReleaseNASM</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSSE2|Win32">
-      <Configuration>ReleaseSSE2</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -25,7 +21,7 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
     <UseOfMfc>false</UseOfMfc>
@@ -37,12 +33,6 @@
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
@@ -51,7 +41,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'" Label="PropertySheets">
+  <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" />
     <Import Project="vc9_lame_config.props" />
     <Import Project="arch_sse2.props" />
@@ -59,12 +49,7 @@
   <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" />
     <Import Project="vc9_lame_config.props" />
-    <Import Project="arch_x87.props" />
-  </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" />
-    <Import Project="vc9_lame_config.props" />
-    <Import Project="arch_x87.props" />
+    <Import Project="arch_sse2.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -72,9 +57,6 @@
     <Import Project="arch_nasm.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -89,13 +71,6 @@
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -119,28 +94,11 @@
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\..\lib-src\libmp3lame\;..\..\..\lib-src\mpglib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\lib-src\libmp3lame\;..\..\..\lib-src\mpglib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_WINDOWS;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
@@ -151,7 +109,7 @@
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
@@ -170,46 +128,38 @@
   <ItemGroup>
     <NASM Include="..\libmp3lame\i386\choose_table.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\cpu_feat.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fft.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fft3dn.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fftfpu.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\fftsse.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\ffttbl.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
     <NASM Include="..\libmp3lame\i386\scalar.nas">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </NASM>
   </ItemGroup>
@@ -260,40 +210,6 @@
     <ClInclude Include="..\..\..\lib-src\libmp3lame\vector\lame_intrin.h" />
     <ClInclude Include="..\..\..\lib-src\libmp3lame\version.h" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\choose_table.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\cpu_feat.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fft.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fft3dn.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fftfpu.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fftsse.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\ffttbl.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\scalar.nas">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </None>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
\ No newline at end of file
diff --git a/win/Projects/libmp3lame/libmp3lame.vcxproj.filters b/win/Projects/libmp3lame/libmp3lame.vcxproj.filters
index 4c767e2c8..f0e2cdc5f 100644
--- a/win/Projects/libmp3lame/libmp3lame.vcxproj.filters
+++ b/win/Projects/libmp3lame/libmp3lame.vcxproj.filters
@@ -145,39 +145,29 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\choose_table.nas">
+    <NASM Include="..\libmp3lame\i386\choose_table.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\cpu_feat.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\cpu_feat.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fft.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\fft.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fft3dn.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\fft3dn.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fftfpu.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\fftfpu.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\fftsse.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\fftsse.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\ffttbl.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\ffttbl.nas">
       <Filter>Asm</Filter>
-    </None>
-    <None Include="..\..\..\lib-src\libmp3lame\i386\scalar.nas">
+    </NASM>
+    <NASM Include="..\libmp3lame\i386\scalar.nas">
       <Filter>Asm</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <NASM Include="..\libmp3lame\i386\choose_table.nas" />
-    <NASM Include="..\libmp3lame\i386\cpu_feat.nas" />
-    <NASM Include="..\libmp3lame\i386\fft.nas" />
-    <NASM Include="..\libmp3lame\i386\fft3dn.nas" />
-    <NASM Include="..\libmp3lame\i386\fftfpu.nas" />
-    <NASM Include="..\libmp3lame\i386\fftsse.nas" />
-    <NASM Include="..\libmp3lame\i386\ffttbl.nas" />
-    <NASM Include="..\libmp3lame\i386\scalar.nas" />
+    </NASM>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/win/Projects/libmp3lame/vc9_nasm.rules b/win/Projects/libmp3lame/vc9_nasm.rules
deleted file mode 100644
index 8b7f64e73..000000000
--- a/win/Projects/libmp3lame/vc9_nasm.rules
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioToolFile
-	Name="NASM "
-	Version="8,00"
-	>
-	<Rules>
-		<CustomBuildRule
-			Name="NASM"
-			DisplayName="NASM"
-			CommandLine="nasmw [BinFormat] [IncludeDir] [Defines] -o [OutFile] $(InputPath)"
-			Outputs="[OutFile]"
-			FileExtensions="*.nas"
-			ExecutionDescription="Assembling $(InputName)..."
-			ShowOnlyRuleProperties="false"
-			>
-			<Properties>
-				<StringProperty
-					Name="OutFile"
-					DisplayName="output file path"
-					Switch="[value]"
-					DefaultValue="$(IntDir)\$(InputName).obj"
-				/>
-				<StringProperty
-					Name="BinFormat"
-					DisplayName="Binary format"
-					Switch="-f [value]"
-					DefaultValue="win32"
-				/>
-				<StringProperty
-					Name="IncludeDir"
-					DisplayName="Additional include directories"
-					Switch="-i [value]"
-					DefaultValue="$(InputDir)"
-					Delimited="true"
-				/>
-				<StringProperty
-					Name="Defines"
-					DisplayName="Defines"
-					Switch="-D[value]"
-					DefaultValue="WIN32"
-					Delimited="true"
-					Delimiters=" ;,"
-				/>
-			</Properties>
-		</CustomBuildRule>
-	</Rules>
-</VisualStudioToolFile>
diff --git a/win/Projects/libmp3lame/vc9_nasm.targets b/win/Projects/libmp3lame/vc9_nasm.targets
deleted file mode 100644
index 7f63b993c..000000000
--- a/win/Projects/libmp3lame/vc9_nasm.targets
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PropertyPageSchema
-      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />
-    <AvailableItemName
-      Include="NASM">
-      <Targets>_NASM</Targets>
-    </AvailableItemName>
-  </ItemGroup>
-  <UsingTask
-    TaskName="NASM"
-    TaskFactory="XamlTaskFactory"
-    AssemblyName="Microsoft.Build.Tasks.v4.0, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>
-  </UsingTask>
-  <Target
-    Name="_NASM"
-    BeforeTargets="$(NASMBeforeTargets)"
-    AfterTargets="$(NASMAfterTargets)"
-    Condition="'@(NASM)' != ''"
-    DependsOnTargets="$(NASMDependsOn);ComputeNASMOutput"
-    Outputs="@(NASM-&gt;Metadata('Outputs')-&gt;Distinct())"
-    Inputs="@(NASM);%(NASM.AdditionalDependencies);$(MSBuildProjectFile)">
-    <ItemGroup
-      Condition="'@(SelectedFiles)' != ''">
-      <NASM
-        Remove="@(NASM)"
-        Condition="'%(Identity)' != '@(SelectedFiles)'" />
-    </ItemGroup>
-    <ItemGroup>
-      <NASM_tlog
-        Include="%(NASM.Outputs)"
-        Condition="'%(NASM.Outputs)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'">
-        <Source>@(NASM, '|')</Source>
-      </NASM_tlog>
-    </ItemGroup>
-    <Message
-      Importance="High"
-      Text="%(NASM.ExecutionDescription)" />
-    <WriteLinesToFile
-      Condition="'@(NASM_tlog)' != '' and '%(NASM_tlog.ExcludedFromBuild)' != 'true'"
-      File="$(TLogLocation)$(ProjectName).write.1u.tlog"
-      Lines="^%(NASM_tlog.Source);@(NASM_tlog-&gt;'%(Fullpath)')"
-      Encoding="Unicode" />
-    <NASM
-      Condition="'@(NASM)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'"
-      CommandLineTemplate="%(NASM.CommandLineTemplate)"
-      OutFile="%(NASM.OutFile)"
-      BinFormat="%(NASM.BinFormat)"
-      IncludeDir="%(NASM.IncludeDir)"
-      Defines="%(NASM.Defines)"
-      AdditionalOptions="%(NASM.AdditionalOptions)"
-      Inputs="@(NASM)" />
-  </Target>
-  <PropertyGroup>
-    <ComputeLinkInputsTargets>
-            $(ComputeLinkInputsTargets);
-            ComputeNASMOutput;
-          </ComputeLinkInputsTargets>
-    <ComputeLibInputsTargets>
-            $(ComputeLibInputsTargets);
-            ComputeNASMOutput;
-          </ComputeLibInputsTargets>
-  </PropertyGroup>
-  <Target
-    Name="ComputeNASMOutput"
-    Condition="'@(NASM)' != ''">
-    <ItemGroup>
-      <NASMDirsToMake
-        Condition="'@(NASM)' != '' and '%(NASM.ExcludedFromBuild)' != 'true'"
-        Include="%(NASM.Outputs)" />
-      <Link
-        Include="%(NASMDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <Lib
-        Include="%(NASMDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-      <ImpLib
-        Include="%(NASMDirsToMake.Identity)"
-        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />
-    </ItemGroup>
-    <MakeDir
-      Directories="@(NASMDirsToMake-&gt;'%(RootDir)%(Directory)')" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/win/Projects/libmp3lame/vc9_nasm.xml b/win/Projects/libmp3lame/vc9_nasm.xml
deleted file mode 100644
index ce30cd22a..000000000
--- a/win/Projects/libmp3lame/vc9_nasm.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
-  <Rule
-    Name="NASM"
-    PageTemplate="tool"
-    DisplayName="NASM"
-    Order="200">
-    <Rule.DataSource>
-      <DataSource
-        Persistence="ProjectFile"
-        ItemType="NASM" />
-    </Rule.DataSource>
-    <Rule.Categories>
-      <Category
-        Name="General">
-        <Category.DisplayName>
-          <sys:String>General</sys:String>
-        </Category.DisplayName>
-      </Category>
-      <Category
-        Name="Command Line"
-        Subtype="CommandLine">
-        <Category.DisplayName>
-          <sys:String>Command Line</sys:String>
-        </Category.DisplayName>
-      </Category>
-    </Rule.Categories>
-    <StringListProperty
-      Name="Inputs"
-      Category="Command Line"
-      IsRequired="true"
-      Switch=" ">
-      <StringListProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType="NASM"
-          SourceType="Item" />
-      </StringListProperty.DataSource>
-    </StringListProperty>
-    <StringProperty
-      Name="OutFile"
-      HelpContext="0"
-      DisplayName="output file path"
-      Switch="[value]" />
-    <StringProperty
-      Name="BinFormat"
-      HelpContext="0"
-      DisplayName="Binary format"
-      Switch="-f [value]" />
-    <StringListProperty
-      Name="IncludeDir"
-      HelpContext="0"
-      DisplayName="Additional include directories"
-      Separator=";"
-      Switch="-i [value]" />
-    <StringListProperty
-      Name="Defines"
-      HelpContext="0"
-      DisplayName="Defines"
-      Separator=" ;,"
-      Switch="-D[value]" />
-    <StringProperty
-      Name="CommandLineTemplate"
-      DisplayName="Command Line"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <DynamicEnumProperty
-      Name="NASMBeforeTargets"
-      Category="General"
-      EnumProvider="Targets"
-      IncludeInCommandLine="False">
-      <DynamicEnumProperty.DisplayName>
-        <sys:String>Execute Before</sys:String>
-      </DynamicEnumProperty.DisplayName>
-      <DynamicEnumProperty.Description>
-        <sys:String>Specifies the targets for the build customization to run before.</sys:String>
-      </DynamicEnumProperty.Description>
-      <DynamicEnumProperty.ProviderSettings>
-        <NameValuePair
-          Name="Exclude"
-          Value="^NASMBeforeTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <DynamicEnumProperty
-      Name="NASMAfterTargets"
-      Category="General"
-      EnumProvider="Targets"
-      IncludeInCommandLine="False">
-      <DynamicEnumProperty.DisplayName>
-        <sys:String>Execute After</sys:String>
-      </DynamicEnumProperty.DisplayName>
-      <DynamicEnumProperty.Description>
-        <sys:String>Specifies the targets for the build customization to run after.</sys:String>
-      </DynamicEnumProperty.Description>
-      <DynamicEnumProperty.ProviderSettings>
-        <NameValuePair
-          Name="Exclude"
-          Value="^NASMAfterTargets|^Compute" />
-      </DynamicEnumProperty.ProviderSettings>
-      <DynamicEnumProperty.DataSource>
-        <DataSource
-          Persistence="ProjectFile"
-          ItemType=""
-          HasConfigurationCondition="true" />
-      </DynamicEnumProperty.DataSource>
-    </DynamicEnumProperty>
-    <StringListProperty
-      Name="Outputs"
-      DisplayName="Outputs"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringProperty
-      Name="ExecutionDescription"
-      DisplayName="Execution Description"
-      Visible="False"
-      IncludeInCommandLine="False" />
-    <StringListProperty
-      Name="AdditionalDependencies"
-      DisplayName="Additional Dependencies"
-      IncludeInCommandLine="False"
-      Visible="true" />
-    <StringProperty
-      Subtype="AdditionalOptions"
-      Name="AdditionalOptions"
-      Category="Command Line">
-      <StringProperty.DisplayName>
-        <sys:String>Additional Options</sys:String>
-      </StringProperty.DisplayName>
-      <StringProperty.Description>
-        <sys:String>Additional Options</sys:String>
-      </StringProperty.Description>
-    </StringProperty>
-  </Rule>
-  <ItemType
-    Name="NASM"
-    DisplayName="NASM" />
-  <FileExtension
-    Name="*.nas"
-    ContentType="NASM" />
-  <ContentType
-    Name="NASM"
-    DisplayName="NASM"
-    ItemType="NASM" />
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/win/Projects/libmpg123/arch_nasm.props b/win/Projects/libmpg123/arch_nasm.props
deleted file mode 100644
index 0e2328922..000000000
--- a/win/Projects/libmpg123/arch_nasm.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>TAKEHIRO_IEEE754_HACK;HAVE_NASM;MMX_choose_table;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/win/Projects/libmpg123/arch_sse2.props b/win/Projects/libmpg123/arch_sse2.props
deleted file mode 100644
index f1176cd8e..000000000
--- a/win/Projects/libmpg123/arch_sse2.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>HAVE_XMMINTRIN_H;MIN_ARCH_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Fast</FloatingPointModel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/win/Projects/libmpg123/arch_x87.props b/win/Projects/libmpg123/arch_x87.props
deleted file mode 100644
index a6ef87bf1..000000000
--- a/win/Projects/libmpg123/arch_x87.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>TAKEHIRO_IEEE754_HACK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/win/Projects/libmpg123/libmpg123.vcxproj b/win/Projects/libmpg123/libmpg123.vcxproj
index 8f8a79c53..978ff429a 100644
--- a/win/Projects/libmpg123/libmpg123.vcxproj
+++ b/win/Projects/libmpg123/libmpg123.vcxproj
@@ -9,10 +9,6 @@
       <Configuration>ReleaseNASM</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSSE2|Win32">
-      <Configuration>ReleaseSSE2</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -25,12 +21,6 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <PlatformToolset>v141</PlatformToolset>
@@ -52,30 +42,22 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'" Label="PropertySheets">
+  <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" />
-    <Import Project="vc9_lame_config.props" />
-    <Import Project="arch_sse2.props" />
+    <Import Project="..\libmp3lame\vc9_lame_config.props" />
+    <Import Project="..\libmp3lame\arch_sse2.props" />
   </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" />
-    <Import Project="vc9_lame_config.props" />
-    <Import Project="arch_x87.props" />
-  </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" />
-    <Import Project="vc9_lame_config.props" />
-    <Import Project="arch_x87.props" />
+    <Import Project="..\libmp3lame\vc9_lame_config.props" />
+    <Import Project="..\libmp3lame\arch_sse2.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseNASM|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="vc9_lame_config.props" />
-    <Import Project="arch_nasm.props" />
+    <Import Project="..\libmp3lame\vc9_lame_config.props" />
+    <Import Project="..\libmp3lame\arch_nasm.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -90,13 +72,6 @@
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules />
-    <CodeAnalysisRuleAssemblies />
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -120,6 +95,21 @@
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\lib-src\libmp3lame\;..\..\..\lib-src\mpglib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;USE_LAYER_2;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Lib>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>Full</Optimization>
@@ -136,42 +126,8 @@
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\lib-src\libmp3lame\;..\..\..\lib-src\mpglib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;USE_LAYER_2;HAVE_MPGLIB;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSSE2|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\..\..\lib-src\libmp3lame\;..\..\..\lib-src\mpglib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;HAVE_MPGLIB;_WINDOWS;USE_LAYER_2;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\lib-src\mpglib\common.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
+    <ClCompile Include="..\..\..\lib-src\mpglib\common.c" />
     <ClCompile Include="..\..\..\lib-src\mpglib\dct64_i386.c" />
     <ClCompile Include="..\..\..\lib-src\mpglib\decode_i386.c" />
     <ClCompile Include="..\..\..\lib-src\mpglib\interface.c" />
@@ -198,4 +154,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win/Projects/libmpg123/vc9_lame_config.props b/win/Projects/libmpg123/vc9_lame_config.props
deleted file mode 100644
index e593f2f84..000000000
--- a/win/Projects/libmpg123/vc9_lame_config.props
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-    <OutDir>$(SolutionDir)..\output\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)..\obj\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Bscmake>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4995;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>
\ No newline at end of file
diff --git a/win/Projects/libmpg123/vc9_nasm.props b/win/Projects/libmpg123/vc9_nasm.props
deleted file mode 100644
index 260975d69..000000000
--- a/win/Projects/libmpg123/vc9_nasm.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup
-    Condition="'$(NASMBeforeTargets)' == '' and '$(NASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
-    <NASMBeforeTargets>Midl</NASMBeforeTargets>
-    <NASMAfterTargets>CustomBuild</NASMAfterTargets>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NASMDependsOn
-      Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(NASMDependsOn)</NASMDependsOn>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <NASM>
-      <OutFile>$(IntDir)%(Filename).obj</OutFile>
-      <BinFormat>win32</BinFormat>
-      <IncludeDir>%(RootDir)%(Directory)</IncludeDir>
-      <Defines>WIN32</Defines>
-      <CommandLineTemplate>nasmw [BinFormat] [IncludeDir] [Defines] -o [OutFile] %(FullPath)</CommandLineTemplate>
-      <Outputs>[OutFile]</Outputs>
-      <ExecutionDescription>Assembling %(Filename)...</ExecutionDescription>
-      <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>
-    </NASM>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/win/audacity.sln b/win/audacity.sln
index 4f9a0b884..6989c5d59 100644
--- a/win/audacity.sln
+++ b/win/audacity.sln
@@ -69,235 +69,117 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
-		ReleaseNASM|Win32 = ReleaseNASM|Win32
-		ReleaseSSE2|Win32 = ReleaseSSE2|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Debug|Win32.ActiveCfg = Debug|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Debug|Win32.Build.0 = Debug|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Release|Win32.ActiveCfg = Release|Win32
 		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.Release|Win32.Build.0 = Release|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{1D64095C-F936-4FCF-B609-56E9DDF941FA}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Debug|Win32.Build.0 = Debug|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Release|Win32.ActiveCfg = Release|Win32
 		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.Release|Win32.Build.0 = Release|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{EC3F5835-C486-4970-8A6B-A0700F4B3637}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Debug|Win32.Build.0 = Debug|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Release|Win32.ActiveCfg = Release|Win32
 		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.Release|Win32.Build.0 = Release|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{6C7DC635-26FB-419A-B69A-7ECBBB068245}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Debug|Win32.Build.0 = Debug|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Release|Win32.ActiveCfg = Release|Win32
 		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.Release|Win32.Build.0 = Release|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{B28C9F3F-FF0E-4FEC-844C-685390B8AC06}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Debug|Win32.Build.0 = Debug|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Release|Win32.ActiveCfg = Release|Win32
 		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.Release|Win32.Build.0 = Release|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{D96C7BE1-E3F1-4767-BBBB-320E082CE425}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Debug|Win32.Build.0 = Debug|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Release|Win32.ActiveCfg = Release|Win32
 		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.Release|Win32.Build.0 = Release|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{A52BBEA5-8B02-4147-8734-5D9BBF4D1177}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Debug|Win32.Build.0 = Debug|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Release|Win32.ActiveCfg = Release|Win32
 		{7AA41BED-41B0-427A-9148-DEA40549D158}.Release|Win32.Build.0 = Release|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{7AA41BED-41B0-427A-9148-DEA40549D158}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Debug|Win32.Build.0 = Debug|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Release|Win32.ActiveCfg = Release|Win32
 		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.Release|Win32.Build.0 = Release|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{F4B4A272-4ED3-4951-A6EE-B7BAAC1C4952}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Debug|Win32.Build.0 = Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Release|Win32.ActiveCfg = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.Release|Win32.Build.0 = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814857}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Debug|Win32.Build.0 = Debug|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.ActiveCfg = Release|Win32
 		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.Release|Win32.Build.0 = Release|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{3A76129B-55AB-4D54-BAA7-08F63ED52569}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Debug|Win32.Build.0 = Debug|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Release|Win32.ActiveCfg = Release|Win32
 		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.Release|Win32.Build.0 = Release|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{727D6675-67EE-4D0B-9DC1-177A0AF741F0}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Debug|Win32.Build.0 = Debug|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Release|Win32.ActiveCfg = Release|Win32
 		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.Release|Win32.Build.0 = Release|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{7ABA0F80-94AE-4E82-AB89-2E1258212D59}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Release|Win32.ActiveCfg = Release|Win32
 		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.Release|Win32.Build.0 = Release|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{BE9F28C5-058A-45F5-B2C1-D077BC058AAE}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Debug|Win32.Build.0 = Debug|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Release|Win32.ActiveCfg = Release|Win32
 		{5284D863-3813-479F-BBF0-AC234E216BC6}.Release|Win32.Build.0 = Release|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{5284D863-3813-479F-BBF0-AC234E216BC6}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Debug|Win32.Build.0 = Debug|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Release|Win32.ActiveCfg = Release|Win32
 		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.Release|Win32.Build.0 = Release|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{A61E2BF1-21AA-4118-B0D8-FD3D53DB892E}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Debug|Win32.Build.0 = Debug|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.ActiveCfg = Release|Win32
 		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.Release|Win32.Build.0 = Release|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{8C69F7B6-684F-48D9-9057-8912CA3DAA8B}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Debug|Win32.Build.0 = Debug|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Release|Win32.ActiveCfg = Release|Win32
 		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.Release|Win32.Build.0 = Release|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{8A1C2514-85DD-4AE2-9CF3-3183B66C537D}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Debug|Win32.Build.0 = Debug|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Release|Win32.ActiveCfg = Release|Win32
 		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.Release|Win32.Build.0 = Release|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{A64FFB5D-0CF0-43EE-9DE3-C72260864BFF}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Debug|Win32.Build.0 = Debug|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Release|Win32.ActiveCfg = Release|Win32
 		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.Release|Win32.Build.0 = Release|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{C0FE933B-4AF7-4ACD-95E8-ACD3A73F1400}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Debug|Win32.Build.0 = Debug|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Release|Win32.ActiveCfg = Release|Win32
 		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.Release|Win32.Build.0 = Release|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{D5AB2D87-51DC-4277-A9AB-2A6018D0E947}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{02F94A40-586A-4403-8464-13B50801FFEC}.Release|Win32.ActiveCfg = Release|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{02F94A40-586A-4403-8464-13B50801FFEC}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Debug|Win32.ActiveCfg = Debug|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Debug|Win32.Build.0 = Debug|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Release|Win32.ActiveCfg = Release|Win32
 		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.Release|Win32.Build.0 = Release|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{AF9AD75C-4785-4432-BAC3-ADAB1E7F1192}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Debug|Win32.Build.0 = Debug|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Release|Win32.ActiveCfg = Release|Win32
 		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.Release|Win32.Build.0 = Release|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{0FEC8848-E24E-4FA5-9ACD-E4582DC4CBBE}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Debug|Win32.Build.0 = Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Debug|Win32.Deploy.0 = Debug|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.ActiveCfg = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.Build.0 = Release|Win32
 		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.Release|Win32.Deploy.0 = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{A939AAF8-44F1-4CE7-9DD0-7A6E99814856}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{5FF83E0C-1973-4559-94C3-311C9D0E051B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5FF83E0C-1973-4559-94C3-311C9D0E051B}.Release|Win32.ActiveCfg = Release|Win32
-		{5FF83E0C-1973-4559-94C3-311C9D0E051B}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{5FF83E0C-1973-4559-94C3-311C9D0E051B}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{5FF83E0C-1973-4559-94C3-311C9D0E051B}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{5FF83E0C-1973-4559-94C3-311C9D0E051B}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{D41CD691-F111-4D68-B0C1-C90E7DB07454}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D41CD691-F111-4D68-B0C1-C90E7DB07454}.Release|Win32.ActiveCfg = Release|Win32
-		{D41CD691-F111-4D68-B0C1-C90E7DB07454}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{D41CD691-F111-4D68-B0C1-C90E7DB07454}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{D41CD691-F111-4D68-B0C1-C90E7DB07454}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{D41CD691-F111-4D68-B0C1-C90E7DB07454}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{876BE9ED-1F80-47B6-A34A-1766A6639763}.Debug|Win32.ActiveCfg = Debug|Win32
 		{876BE9ED-1F80-47B6-A34A-1766A6639763}.Release|Win32.ActiveCfg = Release|Win32
-		{876BE9ED-1F80-47B6-A34A-1766A6639763}.ReleaseNASM|Win32.ActiveCfg = Release|Win32
-		{876BE9ED-1F80-47B6-A34A-1766A6639763}.ReleaseNASM|Win32.Build.0 = Release|Win32
-		{876BE9ED-1F80-47B6-A34A-1766A6639763}.ReleaseSSE2|Win32.ActiveCfg = Release|Win32
-		{876BE9ED-1F80-47B6-A34A-1766A6639763}.ReleaseSSE2|Win32.Build.0 = Release|Win32
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.ActiveCfg = Debug|Win32
 		{20536101-3B0E-43EF-94F9-080D595DAC57}.Debug|Win32.Build.0 = Debug|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.Build.0 = ReleaseSSE2|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{20536101-3B0E-43EF-94F9-080D595DAC57}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.ActiveCfg = Release|Win32
+		{20536101-3B0E-43EF-94F9-080D595DAC57}.Release|Win32.Build.0 = Release|Win32
 		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.Build.0 = ReleaseSSE2|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseNASM|Win32.ActiveCfg = ReleaseNASM|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseNASM|Win32.Build.0 = ReleaseNASM|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseSSE2|Win32.ActiveCfg = ReleaseSSE2|Win32
-		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.ReleaseSSE2|Win32.Build.0 = ReleaseSSE2|Win32
+		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.ActiveCfg = Release|Win32
+		{E2DAB91A-8248-4625-8A85-2C2C2A390DD8}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE