• R/O
  • HTTP
  • SSH
  • HTTPS

LameXP: Commit

LameXP development repository


Commit MetaInfo

Revisión9b8ededad0cbcea48ef95a9d9a834859a367e08c (tree)
Tiempo2022-10-09 21:20:16
AutorLoRd_MuldeR <mulder2@gmx....>
CommiterLoRd_MuldeR

Log Message

Build fix in "Release" configuration.

Cambiar Resumen

Diferencia incremental

--- a/LameXP_VS2015.vcxproj
+++ b/LameXP_VS2015.vcxproj
@@ -509,7 +509,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
509509 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
510510 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
511511 </ClCompile>
512- <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx.cpp">
512+ <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx2.cpp">
513513 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
514514 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
515515 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
@@ -2184,7 +2184,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
21842184 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
21852185 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
21862186 </CustomBuild>
2187- <CustomBuild Include="res\Tools.mac-x64-avx.qrc">
2187+ <CustomBuild Include="res\Tools.mac-x64-avx2.qrc">
21882188 <FileType>Document</FileType>
21892189 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
21902190 <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
--- a/LameXP_VS2015.vcxproj.filters
+++ b/LameXP_VS2015.vcxproj.filters
@@ -520,7 +520,7 @@
520520 <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x86-sse2.cpp">
521521 <Filter>Generated Files\QRC</Filter>
522522 </ClCompile>
523- <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx.cpp">
523+ <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx2.cpp">
524524 <Filter>Generated Files\QRC</Filter>
525525 </ClCompile>
526526 <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-sse2.cpp">
@@ -1019,7 +1019,7 @@
10191019 <CustomBuild Include="res\Tools.wvunpack-x86-sse2.qrc">
10201020 <Filter>Resources</Filter>
10211021 </CustomBuild>
1022- <CustomBuild Include="res\Tools.mac-x64-avx.qrc">
1022+ <CustomBuild Include="res\Tools.mac-x64-avx2.qrc">
10231023 <Filter>Resources</Filter>
10241024 </CustomBuild>
10251025 <CustomBuild Include="res\Tools.mac-x64-sse2.qrc">
--- a/LameXP_VS2017.vcxproj
+++ b/LameXP_VS2017.vcxproj
@@ -515,7 +515,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\v141_xp\Shared\plugins\imageformats
515515 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
516516 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
517517 </ClCompile>
518- <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx.cpp">
518+ <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx2.cpp">
519519 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
520520 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
521521 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
@@ -2190,7 +2190,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\v141_xp\Shared\plugins\imageformats
21902190 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
21912191 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
21922192 </CustomBuild>
2193- <CustomBuild Include="res\Tools.mac-x64-avx.qrc">
2193+ <CustomBuild Include="res\Tools.mac-x64-avx2.qrc">
21942194 <FileType>Document</FileType>
21952195 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
21962196 <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
--- a/LameXP_VS2017.vcxproj.filters
+++ b/LameXP_VS2017.vcxproj.filters
@@ -520,7 +520,7 @@
520520 <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x86-sse2.cpp">
521521 <Filter>Generated Files\QRC</Filter>
522522 </ClCompile>
523- <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx.cpp">
523+ <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx2.cpp">
524524 <Filter>Generated Files\QRC</Filter>
525525 </ClCompile>
526526 <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-sse2.cpp">
@@ -1019,7 +1019,7 @@
10191019 <CustomBuild Include="res\Tools.wvunpack-x86-sse2.qrc">
10201020 <Filter>Resources</Filter>
10211021 </CustomBuild>
1022- <CustomBuild Include="res\Tools.mac-x64-avx.qrc">
1022+ <CustomBuild Include="res\Tools.mac-x64-avx2.qrc">
10231023 <Filter>Resources</Filter>
10241024 </CustomBuild>
10251025 <CustomBuild Include="res\Tools.mac-x64-sse2.qrc">
--- a/LameXP_VS2019.vcxproj
+++ b/LameXP_VS2019.vcxproj
@@ -513,7 +513,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
513513 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
514514 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
515515 </ClCompile>
516- <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx.cpp">
516+ <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx2.cpp">
517517 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
518518 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
519519 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
@@ -2188,7 +2188,7 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i
21882188 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
21892189 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">false</ExcludedFromBuild>
21902190 </CustomBuild>
2191- <CustomBuild Include="res\Tools.mac-x64-avx.qrc">
2191+ <CustomBuild Include="res\Tools.mac-x64-avx2.qrc">
21922192 <FileType>Document</FileType>
21932193 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
21942194 <Command Condition="'$(Configuration)|$(Platform)'=='Release_Static|Win32'">"$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)"</Command>
--- a/LameXP_VS2019.vcxproj.filters
+++ b/LameXP_VS2019.vcxproj.filters
@@ -520,7 +520,7 @@
520520 <ClCompile Include="tmp\LameXP\QRC_Tools.wvunpack-x86-sse2.cpp">
521521 <Filter>Generated Files\QRC</Filter>
522522 </ClCompile>
523- <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx.cpp">
523+ <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-avx2.cpp">
524524 <Filter>Generated Files\QRC</Filter>
525525 </ClCompile>
526526 <ClCompile Include="tmp\LameXP\QRC_Tools.mac-x64-sse2.cpp">
@@ -1019,7 +1019,7 @@
10191019 <CustomBuild Include="res\Tools.wvunpack-x86-sse2.qrc">
10201020 <Filter>Resources</Filter>
10211021 </CustomBuild>
1022- <CustomBuild Include="res\Tools.mac-x64-avx.qrc">
1022+ <CustomBuild Include="res\Tools.mac-x64-avx2.qrc">
10231023 <Filter>Resources</Filter>
10241024 </CustomBuild>
10251025 <CustomBuild Include="res\Tools.mac-x64-sse2.qrc">
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,7 +35,7 @@
3535 #define VER_LAMEXP_MINOR_LO 0
3636 #define VER_LAMEXP_TYPE Beta
3737 #define VER_LAMEXP_PATCH 4
38-#define VER_LAMEXP_BUILD 2347
38+#define VER_LAMEXP_BUILD 2348
3939 #define VER_LAMEXP_CONFG 2188
4040
4141 ///////////////////////////////////////////////////////////////////////////////
Show on old repository browser