Updated LAME binaries, compiled with ICL 12.0 and Win2k-fix. Also reorganized QRC files a bit.
This commit is contained in:
parent
fa6b08e68a
commit
8300d58c46
@ -347,7 +347,9 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
||||
<ClCompile Include="tmp\QRC_Icons.cpp" />
|
||||
<ClCompile Include="tmp\QRC_Images.cpp" />
|
||||
<ClCompile Include="tmp\QRC_Localization.cpp" />
|
||||
<ClCompile Include="tmp\QRC_Tools.cpp" />
|
||||
<ClCompile Include="tmp\QRC_Tools_Decd.cpp" />
|
||||
<ClCompile Include="tmp\QRC_Tools_Encd.cpp" />
|
||||
<ClCompile Include="tmp\QRC_Tools_Misc.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\Config.h" />
|
||||
@ -951,20 +953,6 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
<None Include="res\MainIcon.ico" />
|
||||
<CustomBuild Include="res\Tools.qrc">
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"
|
||||
</Command>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="gui\DropBox.ui">
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UIC "$(SolutionDir)tmp\UIC_%(Filename).h"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\uic.exe" -o "$(SolutionDir)tmp\UIC_%(Filename).h" "%(FullPath)"
|
||||
@ -1078,6 +1066,42 @@ del "$(TargetDir)imageformats\q???d4.dll"
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\UIC_%(Filename).h;%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
<None Include="ReadMe.txt" />
|
||||
<CustomBuild Include="res\Tools_Decd.qrc">
|
||||
<FileType>Document</FileType>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="res\Tools_Encd.qrc">
|
||||
<FileType>Document</FileType>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="res\Tools_Misc.qrc">
|
||||
<FileType>Document</FileType>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs)</Outputs>
|
||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp"</Message>
|
||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)"</Command>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="LameXP.rc">
|
||||
|
||||
@ -97,9 +97,6 @@
|
||||
<ClCompile Include="tmp\MOC_Thread_Process.cpp">
|
||||
<Filter>Generated Files\MOC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="tmp\QRC_Tools.cpp">
|
||||
<Filter>Generated Files\QRC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="tmp\QRC_Documents.cpp">
|
||||
<Filter>Generated Files\QRC</Filter>
|
||||
</ClCompile>
|
||||
@ -316,6 +313,15 @@
|
||||
<ClCompile Include="tmp\MOC_Encoder_AAC_FHG.cpp">
|
||||
<Filter>Generated Files\MOC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="tmp\QRC_Tools_Decd.cpp">
|
||||
<Filter>Generated Files\QRC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="tmp\QRC_Tools_Encd.cpp">
|
||||
<Filter>Generated Files\QRC</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="tmp\QRC_Tools_Misc.cpp">
|
||||
<Filter>Generated Files\QRC</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\Config.h">
|
||||
@ -482,9 +488,6 @@
|
||||
<CustomBuild Include="res\Localization.qrc">
|
||||
<Filter>Resources</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="res\Tools.qrc">
|
||||
<Filter>Resources</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="src\Decoder_Abstract.h">
|
||||
<Filter>Header Files\Decoders</Filter>
|
||||
</CustomBuild>
|
||||
@ -593,6 +596,15 @@
|
||||
<CustomBuild Include="src\Encoder_AAC_FHG.h">
|
||||
<Filter>Header Files\Encoders</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="res\Tools_Encd.qrc">
|
||||
<Filter>Resources</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="res\Tools_Misc.qrc">
|
||||
<Filter>Resources</Filter>
|
||||
</CustomBuild>
|
||||
<CustomBuild Include="res\Tools_Decd.qrc">
|
||||
<Filter>Resources</Filter>
|
||||
</CustomBuild>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="res\MainIcon.ico" />
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,35 +0,0 @@
|
||||
<!DOCTYPE RCC>
|
||||
<RCC version="1.0">
|
||||
<qresource>
|
||||
<file>tools/aften.i386.exe</file>
|
||||
<file>tools/aften.sse2.exe</file>
|
||||
<file>tools/aften.x64.exe</file>
|
||||
<file>tools/alac.exe</file>
|
||||
<file>tools/avs2wav.exe</file>
|
||||
<file>tools/elevator.exe</file>
|
||||
<file>tools/faad.exe</file>
|
||||
<file>tools/flac.exe</file>
|
||||
<file>tools/gpgv.exe</file>
|
||||
<file>tools/gpgv.gpg</file>
|
||||
<file>tools/lame.i386.exe</file>
|
||||
<file>tools/lame.sse2.exe</file>
|
||||
<file>tools/mac.exe</file>
|
||||
<file>tools/mediainfo.i386.exe</file>
|
||||
<file>tools/mediainfo.x64.exe</file>
|
||||
<file>tools/mpcdec.exe</file>
|
||||
<file>tools/mpg123.exe</file>
|
||||
<file>tools/oggdec.exe</file>
|
||||
<file>tools/oggenc2.i386.exe</file>
|
||||
<file>tools/oggenc2.sse2.exe</file>
|
||||
<file>tools/oggenc2.x64.exe</file>
|
||||
<file>tools/shorten.exe</file>
|
||||
<file>tools/sox.exe</file>
|
||||
<file>tools/speexdec.exe</file>
|
||||
<file>tools/tta.exe</file>
|
||||
<file>tools/valdec.exe</file>
|
||||
<file>tools/wget.exe</file>
|
||||
<file>tools/wma2wav.exe</file>
|
||||
<file>tools/wupdate.exe</file>
|
||||
<file>tools/wvunpack.exe</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
18
res/Tools_Decd.qrc
Normal file
18
res/Tools_Decd.qrc
Normal file
@ -0,0 +1,18 @@
|
||||
<!DOCTYPE RCC>
|
||||
<RCC version="1.0">
|
||||
<qresource>
|
||||
<file>tools/alac.exe</file>
|
||||
<file>tools/avs2wav.exe</file>
|
||||
<file>tools/faad.exe</file>
|
||||
<file>tools/mac.exe</file>
|
||||
<file>tools/mpcdec.exe</file>
|
||||
<file>tools/mpg123.exe</file>
|
||||
<file>tools/oggdec.exe</file>
|
||||
<file>tools/shorten.exe</file>
|
||||
<file>tools/speexdec.exe</file>
|
||||
<file>tools/tta.exe</file>
|
||||
<file>tools/valdec.exe</file>
|
||||
<file>tools/wma2wav.exe</file>
|
||||
<file>tools/wvunpack.exe</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
14
res/Tools_Encd.qrc
Normal file
14
res/Tools_Encd.qrc
Normal file
@ -0,0 +1,14 @@
|
||||
<!DOCTYPE RCC>
|
||||
<RCC version="1.0">
|
||||
<qresource>
|
||||
<file>tools/aften.i386.exe</file>
|
||||
<file>tools/aften.sse2.exe</file>
|
||||
<file>tools/aften.x64.exe</file>
|
||||
<file>tools/flac.exe</file>
|
||||
<file>tools/lame.i386.exe</file>
|
||||
<file>tools/lame.sse2.exe</file>
|
||||
<file>tools/oggenc2.i386.exe</file>
|
||||
<file>tools/oggenc2.sse2.exe</file>
|
||||
<file>tools/oggenc2.x64.exe</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
13
res/Tools_Misc.qrc
Normal file
13
res/Tools_Misc.qrc
Normal file
@ -0,0 +1,13 @@
|
||||
<!DOCTYPE RCC>
|
||||
<RCC version="1.0">
|
||||
<qresource>
|
||||
<file>tools/elevator.exe</file>
|
||||
<file>tools/gpgv.exe</file>
|
||||
<file>tools/gpgv.gpg</file>
|
||||
<file>tools/mediainfo.i386.exe</file>
|
||||
<file>tools/mediainfo.x64.exe</file>
|
||||
<file>tools/sox.exe</file>
|
||||
<file>tools/wget.exe</file>
|
||||
<file>tools/wupdate.exe</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
Binary file not shown.
Binary file not shown.
@ -29,15 +29,15 @@
|
||||
#define VER_LAMEXP_MINOR_HI 0
|
||||
#define VER_LAMEXP_MINOR_LO 3
|
||||
#define VER_LAMEXP_TYPE Alpha
|
||||
#define VER_LAMEXP_PATCH 14
|
||||
#define VER_LAMEXP_BUILD 659
|
||||
#define VER_LAMEXP_PATCH 15
|
||||
#define VER_LAMEXP_BUILD 660
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Tools versions
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define VER_LAMEXP_TOOL_NEROAAC 1540
|
||||
#define VER_LAMEXP_TOOL_FHGAACENC 20110821
|
||||
#define VER_LAMEXP_TOOL_FHGAACENC 20110822
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Helper macros (aka: having fun with the C pre-processor)
|
||||
|
||||
@ -72,8 +72,8 @@ g_lamexp_tools[] =
|
||||
{"446054f9a7f705f1aadc9053ca7b8a86a775499ef159978954ebdea92de056c34f8841f7", CPU_TYPE_ALL_ALL, "flac.exe", 121},
|
||||
{"dd68d074c5e13a607580f3a24595c0f3882e37211d2ca628f46e6df20fabcc832dad488a", CPU_TYPE_ALL_ALL, "gpgv.exe", 1411},
|
||||
{"b3fca757b3567dab75c042e62213c231de378ea0fdd7fe29b733417cd5d3d33558452f94", CPU_TYPE_ALL_ALL, "gpgv.gpg", UINT_MAX},
|
||||
{"ed5592d76cefd74e700306ccc3781904ce9602b1193747b0e6467a90d799f3cb711812b2", CPU_TYPE_X86_GEN, "lame.i386.exe", 3990},
|
||||
{"2402a8d28301060a1f01c83a96f2f0157a01143e58cf2c484b9e9bb4474fbc1344dd6642", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3990},
|
||||
{"df995d8a9e4e5fab551d0e3460b9209320714dead70f662929fcc00a4bd72d8a6d23844a", CPU_TYPE_X86_GEN, "lame.i386.exe", 3990},
|
||||
{"873faeddc44243b4712cd42dd0bfc3174a07113d245dd834657519ffe5dbd4b1e395ce32", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3990},
|
||||
{"67933924d68ce319795989648f29e7bd1abaac4ec09c26cbb0ff0d15a67a9df17e257933", CPU_TYPE_ALL_ALL, "mac.exe", 406},
|
||||
{"743db1020556b1815c4d6e6093a2538ae813d7fed1e11d254b8809ce54795b77fa696bca", CPU_TYPE_X86_ALL, "mediainfo.i386.exe", 748},
|
||||
{"86ed4b4bd445b9d0c6ee094987d87fe5161102b59c8c74d11f294206c13f1a2ce899e100", CPU_TYPE_X64_GEN, "mediainfo.x64.exe", 748},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user