From 4349ec00dfba91d4f98a8e4f78207692efb0a290 Mon Sep 17 00:00:00 2001 From: Jeff Lenk <jeff@jefflenk.com> Date: Mon, 31 Oct 2011 14:38:41 -0500 Subject: [PATCH] upgrade lame for windows to lame-3.98.4 --- libs/win32/Download LAME.2008.vcproj | 8 +- libs/win32/Download LAME.2010.vcxproj | 8 +- libs/win32/libmp3lame/libmp3lame.2010.vcxproj | 106 +++++++++--------- libs/win32/libmp3lame/libmp3lame_vc7.vcproj | 106 +++++++++--------- 4 files changed, 114 insertions(+), 114 deletions(-) diff --git a/libs/win32/Download LAME.2008.vcproj b/libs/win32/Download LAME.2008.vcproj index 3deff23580..41b58f1a11 100644 --- a/libs/win32/Download LAME.2008.vcproj +++ b/libs/win32/Download LAME.2008.vcproj @@ -76,8 +76,8 @@ <Tool Name="VCCustomBuildTool" Description="Downloading Lame." - CommandLine="if not exist "$(ProjectDir)..\lame-3.97" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz "$(ProjectDir).."
" - Outputs="$(ProjectDir)..\lame-3.97" + CommandLine="if not exist "$(ProjectDir)..\lame-3.98.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.98.4.tar.gz "$(ProjectDir).."
" + Outputs="$(ProjectDir)..\lame-3.98.4" /> </FileConfiguration> <FileConfiguration @@ -86,8 +86,8 @@ <Tool Name="VCCustomBuildTool" Description="Downloading Lame." - CommandLine="if not exist "$(ProjectDir)..\lame-3.97" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz "$(ProjectDir).."
" - Outputs="$(ProjectDir)..\lame-3.97" + CommandLine="if not exist "$(ProjectDir)..\lame-3.98.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.98.4.tar.gz "$(ProjectDir).."
" + Outputs="$(ProjectDir)..\lame-3.98.4" /> </FileConfiguration> </File> diff --git a/libs/win32/Download LAME.2010.vcxproj b/libs/win32/Download LAME.2010.vcxproj index 0715177aff..2411534cd7 100644 --- a/libs/win32/Download LAME.2010.vcxproj +++ b/libs/win32/Download LAME.2010.vcxproj @@ -66,13 +66,13 @@ <CustomBuild Include="cleancount"> <FileType>Document</FileType> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Lame.</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\lame-3.97" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz "$(ProjectDir).." + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\lame-3.98.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.98.4.tar.gz "$(ProjectDir).." </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\lame-3.97;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\lame-3.98.4;%(Outputs)</Outputs> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Lame.</Message> - <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\lame-3.97" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.97.tar.gz "$(ProjectDir).." + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\lame-3.98.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lame-3.98.4.tar.gz "$(ProjectDir).." </Command> - <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\lame-3.97;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\lame-3.98.4;%(Outputs)</Outputs> </CustomBuild> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/libs/win32/libmp3lame/libmp3lame.2010.vcxproj b/libs/win32/libmp3lame/libmp3lame.2010.vcxproj index 8cb8f570ea..d88f17efd6 100644 --- a/libs/win32/libmp3lame/libmp3lame.2010.vcxproj +++ b/libs/win32/libmp3lame/libmp3lame.2010.vcxproj @@ -67,7 +67,7 @@ <ClCompile> <AdditionalOptions>/GAy /QIfdiv /QI0f %(AdditionalOptions)</AdditionalOptions> <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>.;..\..\lame-3.97;..\..\lame-3.97\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -90,7 +90,7 @@ <ClCompile> <AdditionalOptions>/GAy /QIfdiv /QI0f %(AdditionalOptions)</AdditionalOptions> <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>.;..\..\lame-3.97;..\..\lame-3.97\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -109,7 +109,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.;..\..\lame-3.97;..\..\lame-3.97\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <WarningLevel>TurnOffAllWarnings</WarningLevel> @@ -129,7 +129,7 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>.;..\..\lame-3.97;..\..\lame-3.97\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>.;..\..\lame-3.98.4;..\..\lame-3.98.4\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <WarningLevel>TurnOffAllWarnings</WarningLevel> @@ -144,7 +144,7 @@ </Lib> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="..\..\lame-3.97\libmp3lame\bitstream.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\bitstream.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -158,7 +158,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\encoder.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\encoder.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -172,7 +172,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\fft.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\fft.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -186,7 +186,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\gain_analysis.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\gain_analysis.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -200,7 +200,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\id3tag.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\id3tag.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -214,7 +214,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\lame.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\lame.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -228,7 +228,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\mpglib_interface.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\mpglib_interface.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -242,7 +242,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\newmdct.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\newmdct.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -256,7 +256,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\presets.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\presets.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -270,7 +270,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\psymodel.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\psymodel.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -284,7 +284,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\quantize.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\quantize.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -298,7 +298,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\quantize_pvt.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\quantize_pvt.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -312,7 +312,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\reservoir.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\reservoir.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -326,7 +326,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\set_get.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\set_get.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -340,7 +340,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\tables.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\tables.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -358,7 +358,7 @@ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</WarningLevel> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\takehiro.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\takehiro.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -372,7 +372,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\util.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\util.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -386,7 +386,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\vbrquantize.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\vbrquantize.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -400,7 +400,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\VbrTag.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\VbrTag.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -414,7 +414,7 @@ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> - <ClCompile Include="..\..\lame-3.97\libmp3lame\version.c"> + <ClCompile Include="..\..\lame-3.98.4\libmp3lame\version.c"> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -430,37 +430,37 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\lame-3.97\libmp3lame\bitstream.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\encoder.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\fft.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\gain_analysis.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\id3tag.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\l3side.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\lame-analysis.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\lame_global_flags.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\lameerror.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\machine.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\newmdct.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\psymodel.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\quantize.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\quantize_pvt.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\reservoir.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\set_get.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\tables.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\util.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\vbrquantize.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\VbrTag.h" /> - <ClInclude Include="..\..\lame-3.97\libmp3lame\version.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\bitstream.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\encoder.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\fft.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\gain_analysis.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\id3tag.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\l3side.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\lame-analysis.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\lame_global_flags.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\lameerror.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\machine.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\newmdct.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\psymodel.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\quantize.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\quantize_pvt.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\reservoir.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\set_get.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\tables.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\util.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\vbrquantize.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\VbrTag.h" /> + <ClInclude Include="..\..\lame-3.98.4\libmp3lame\version.h" /> </ItemGroup> <ItemGroup> - <None Include="..\..\lame-3.97\libmp3lame\i386\choose_table.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\cpu_feat.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\fft.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\fft3dn.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\fftfpu.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\fftsse.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\ffttbl.nas" /> - <None Include="..\..\lame-3.97\libmp3lame\i386\scalar.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\choose_table.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\cpu_feat.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\fft.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\fft3dn.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\fftfpu.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\fftsse.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\ffttbl.nas" /> + <None Include="..\..\lame-3.98.4\libmp3lame\i386\scalar.nas" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Download LAME.2010.vcxproj"> diff --git a/libs/win32/libmp3lame/libmp3lame_vc7.vcproj b/libs/win32/libmp3lame/libmp3lame_vc7.vcproj index 5f4e5c3255..f384796889 100644 --- a/libs/win32/libmp3lame/libmp3lame_vc7.vcproj +++ b/libs/win32/libmp3lame/libmp3lame_vc7.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GAy /QIfdiv /QI0f" Optimization="2" - AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.98.4";"..\..\lame-3.98.4\include"" PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="0" @@ -117,7 +117,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/GAy /QIfdiv /QI0f" Optimization="2" - AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.98.4";"..\..\lame-3.98.4\include"" PreprocessorDefinitions="NDEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" StringPooling="true" RuntimeLibrary="0" @@ -184,7 +184,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.98.4";"..\..\lame-3.98.4\include"" PreprocessorDefinitions="_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" RuntimeLibrary="1" PrecompiledHeaderFile="$(IntDir)/libmp3lame_vc6.pch" @@ -254,7 +254,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=".;"..\..\lame-3.97";"..\..\lame-3.97\include"" + AdditionalIncludeDirectories=".;"..\..\lame-3.98.4";"..\..\lame-3.98.4\include"" PreprocessorDefinitions="_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H" RuntimeLibrary="1" PrecompiledHeaderFile="$(IntDir)/libmp3lame_vc6.pch" @@ -303,7 +303,7 @@ Filter="c" > <File - RelativePath="..\..\lame-3.97\libmp3lame\bitstream.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\bitstream.c" > <FileConfiguration Name="Release|Win32" @@ -347,7 +347,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\encoder.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\encoder.c" > <FileConfiguration Name="Release|Win32" @@ -391,7 +391,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\fft.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\fft.c" > <FileConfiguration Name="Release|Win32" @@ -435,7 +435,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\gain_analysis.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\gain_analysis.c" > <FileConfiguration Name="Release|Win32" @@ -479,7 +479,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\id3tag.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\id3tag.c" > <FileConfiguration Name="Release|Win32" @@ -523,7 +523,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\lame.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\lame.c" > <FileConfiguration Name="Release|Win32" @@ -567,7 +567,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\mpglib_interface.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\mpglib_interface.c" > <FileConfiguration Name="Release|Win32" @@ -611,7 +611,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\newmdct.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\newmdct.c" > <FileConfiguration Name="Release|Win32" @@ -655,7 +655,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\presets.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\presets.c" > <FileConfiguration Name="Release|Win32" @@ -699,7 +699,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\psymodel.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\psymodel.c" > <FileConfiguration Name="Release|Win32" @@ -743,7 +743,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\quantize.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\quantize.c" > <FileConfiguration Name="Release|Win32" @@ -787,7 +787,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\quantize_pvt.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\quantize_pvt.c" > <FileConfiguration Name="Release|Win32" @@ -831,7 +831,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\reservoir.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\reservoir.c" > <FileConfiguration Name="Release|Win32" @@ -875,7 +875,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\set_get.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\set_get.c" > <FileConfiguration Name="Release|Win32" @@ -919,7 +919,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\tables.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\tables.c" > <FileConfiguration Name="Release|Win32" @@ -967,7 +967,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\takehiro.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\takehiro.c" > <FileConfiguration Name="Release|Win32" @@ -1011,7 +1011,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\util.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\util.c" > <FileConfiguration Name="Release|Win32" @@ -1055,7 +1055,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\vbrquantize.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\vbrquantize.c" > <FileConfiguration Name="Release|Win32" @@ -1099,7 +1099,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\VbrTag.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\VbrTag.c" > <FileConfiguration Name="Release|Win32" @@ -1143,7 +1143,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\version.c" + RelativePath="..\..\lame-3.98.4\libmp3lame\version.c" > <FileConfiguration Name="Release|Win32" @@ -1192,87 +1192,87 @@ Filter="h" > <File - RelativePath="..\..\lame-3.97\libmp3lame\bitstream.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\bitstream.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\encoder.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\encoder.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\fft.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\fft.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\gain_analysis.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\gain_analysis.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\id3tag.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\id3tag.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\l3side.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\l3side.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\lame-analysis.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\lame-analysis.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\lame_global_flags.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\lame_global_flags.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\lameerror.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\lameerror.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\machine.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\machine.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\newmdct.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\newmdct.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\psymodel.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\psymodel.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\quantize.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\quantize.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\quantize_pvt.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\quantize_pvt.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\reservoir.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\reservoir.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\set_get.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\set_get.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\tables.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\tables.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\util.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\util.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\vbrquantize.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\vbrquantize.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\VbrTag.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\VbrTag.h" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\version.h" + RelativePath="..\..\lame-3.98.4\libmp3lame\version.h" > </File> </Filter> @@ -1281,35 +1281,35 @@ Filter=".nas" > <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\choose_table.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\choose_table.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\cpu_feat.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\cpu_feat.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\fft.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\fft.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\fft3dn.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\fft3dn.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\fftfpu.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\fftfpu.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\fftsse.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\fftsse.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\ffttbl.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\ffttbl.nas" > </File> <File - RelativePath="..\..\lame-3.97\libmp3lame\i386\scalar.nas" + RelativePath="..\..\lame-3.98.4\libmp3lame\i386\scalar.nas" > </File> </Filter>