diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj index 43976fff..c7504e81 100644 --- a/LameXP_VS2013.vcxproj +++ b/LameXP_VS2013.vcxproj @@ -556,20 +556,25 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false - - true - true + false + true + true - - true - true + false + true + true - - true - true + false + true + true + + + false + true + true true @@ -1766,51 +1771,6 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - Document "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" @@ -2396,6 +2356,66 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters index ddb93bd3..d7207de5 100644 --- a/LameXP_VS2013.vcxproj.filters +++ b/LameXP_VS2013.vcxproj.filters @@ -454,15 +454,6 @@ Generated Files\QRC - - Generated Files\QRC - - - Generated Files\QRC - - - Generated Files\QRC - Generated Files\QRC @@ -574,6 +565,18 @@ Generated Files\QRC + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + @@ -956,15 +959,6 @@ Resources - - Resources - - - Resources - - - Resources - Resources @@ -1082,6 +1076,18 @@ Resources + + Resources + + + Resources + + + Resources + + + Resources + diff --git a/LameXP_VS2015.vcxproj b/LameXP_VS2015.vcxproj index b4aa44ff..8af432d9 100644 --- a/LameXP_VS2015.vcxproj +++ b/LameXP_VS2015.vcxproj @@ -556,20 +556,25 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false - - true - true + false + true + true - - true - true + false + true + true - - true - true + false + true + true + + + false + true + true true @@ -1766,51 +1771,6 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - Document "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" @@ -2396,6 +2356,66 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + diff --git a/LameXP_VS2015.vcxproj.filters b/LameXP_VS2015.vcxproj.filters index ddb93bd3..d7207de5 100644 --- a/LameXP_VS2015.vcxproj.filters +++ b/LameXP_VS2015.vcxproj.filters @@ -454,15 +454,6 @@ Generated Files\QRC - - Generated Files\QRC - - - Generated Files\QRC - - - Generated Files\QRC - Generated Files\QRC @@ -574,6 +565,18 @@ Generated Files\QRC + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + @@ -956,15 +959,6 @@ Resources - - Resources - - - Resources - - - Resources - Resources @@ -1082,6 +1076,18 @@ Resources + + Resources + + + Resources + + + Resources + + + Resources + diff --git a/LameXP_VS2017.vcxproj b/LameXP_VS2017.vcxproj index 61c6c013..3020c984 100644 --- a/LameXP_VS2017.vcxproj +++ b/LameXP_VS2017.vcxproj @@ -557,20 +557,25 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false - - true - true + false + true + true - - true - true + false + true + true - - true - true + false + true + true + + + false + true + true true @@ -1767,51 +1772,6 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - - - Document - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" - RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" - $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) - true - true - false - Document "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" @@ -2397,6 +2357,66 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i true false + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + false + diff --git a/LameXP_VS2017.vcxproj.filters b/LameXP_VS2017.vcxproj.filters index ddb93bd3..d7207de5 100644 --- a/LameXP_VS2017.vcxproj.filters +++ b/LameXP_VS2017.vcxproj.filters @@ -454,15 +454,6 @@ Generated Files\QRC - - Generated Files\QRC - - - Generated Files\QRC - - - Generated Files\QRC - Generated Files\QRC @@ -574,6 +565,18 @@ Generated Files\QRC + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + @@ -956,15 +959,6 @@ Resources - - Resources - - - Resources - - - Resources - Resources @@ -1082,6 +1076,18 @@ Resources + + Resources + + + Resources + + + Resources + + + Resources + diff --git a/res/Tools.mpg123-avx.qrc b/res/Tools.mpg123-avx.qrc deleted file mode 100644 index d529889e..00000000 --- a/res/Tools.mpg123-avx.qrc +++ /dev/null @@ -1,2 +0,0 @@ - -tools/mpg123.avx.exe diff --git a/res/Tools.mpg123-i686.qrc b/res/Tools.mpg123-i686.qrc deleted file mode 100644 index 922d0553..00000000 --- a/res/Tools.mpg123-i686.qrc +++ /dev/null @@ -1,2 +0,0 @@ - -tools/mpg123.i686.exe diff --git a/res/Tools.mpg123-sse2.qrc b/res/Tools.mpg123-sse2.qrc deleted file mode 100644 index 18812ff7..00000000 --- a/res/Tools.mpg123-sse2.qrc +++ /dev/null @@ -1,2 +0,0 @@ - -tools/mpg123.sse2.exe diff --git a/res/Tools.mpg123-x64-avx.qrc b/res/Tools.mpg123-x64-avx.qrc new file mode 100644 index 00000000..b76f41c7 --- /dev/null +++ b/res/Tools.mpg123-x64-avx.qrc @@ -0,0 +1,2 @@ + +tools/mpg123.x64-avx.exe diff --git a/res/Tools.mpg123-x64-sse2.qrc b/res/Tools.mpg123-x64-sse2.qrc new file mode 100644 index 00000000..9cd1e99f --- /dev/null +++ b/res/Tools.mpg123-x64-sse2.qrc @@ -0,0 +1,2 @@ + +tools/mpg123.x64-sse2.exe diff --git a/res/Tools.mpg123-x86-i686.qrc b/res/Tools.mpg123-x86-i686.qrc new file mode 100644 index 00000000..cb51b8c9 --- /dev/null +++ b/res/Tools.mpg123-x86-i686.qrc @@ -0,0 +1,2 @@ + +tools/mpg123.x86-i686.exe diff --git a/res/Tools.mpg123-x86-sse2.qrc b/res/Tools.mpg123-x86-sse2.qrc new file mode 100644 index 00000000..f4afbd25 --- /dev/null +++ b/res/Tools.mpg123-x86-sse2.qrc @@ -0,0 +1,2 @@ + +tools/mpg123.x86-sse2.exe diff --git a/res/_ALL.qrc b/res/_ALL.qrc index 20121c57..26a1505a 100644 --- a/res/_ALL.qrc +++ b/res/_ALL.qrc @@ -237,9 +237,10 @@ tools/mediainfo.sse2.exe tools/mediainfo.x64.exe tools/mpcdec.exe - tools/mpg123.avx.exe - tools/mpg123.i686.exe - tools/mpg123.sse2.exe + tools/mpg123.x64-avx.exe + tools/mpg123.x64-sse2.exe + tools/mpg123.x86-i686.exe + tools/mpg123.x86-sse2.exe tools/oggdec.avx.exe tools/oggdec.i686.exe tools/oggdec.sse2.exe diff --git a/res/tools/mpg123.avx.exe b/res/tools/mpg123.avx.exe deleted file mode 100644 index e49d0caa..00000000 Binary files a/res/tools/mpg123.avx.exe and /dev/null differ diff --git a/res/tools/mpg123.i686.exe b/res/tools/mpg123.i686.exe deleted file mode 100644 index 1d164652..00000000 Binary files a/res/tools/mpg123.i686.exe and /dev/null differ diff --git a/res/tools/mpg123.sse2.exe b/res/tools/mpg123.sse2.exe deleted file mode 100644 index ceafefde..00000000 Binary files a/res/tools/mpg123.sse2.exe and /dev/null differ diff --git a/res/tools/mpg123.x64-avx.exe b/res/tools/mpg123.x64-avx.exe new file mode 100644 index 00000000..5188eb17 Binary files /dev/null and b/res/tools/mpg123.x64-avx.exe differ diff --git a/res/tools/mpg123.x64-sse2.exe b/res/tools/mpg123.x64-sse2.exe new file mode 100644 index 00000000..0524fe11 Binary files /dev/null and b/res/tools/mpg123.x64-sse2.exe differ diff --git a/res/tools/mpg123.x86-i686.exe b/res/tools/mpg123.x86-i686.exe new file mode 100644 index 00000000..e86a9d32 Binary files /dev/null and b/res/tools/mpg123.x86-i686.exe differ diff --git a/res/tools/mpg123.x86-sse2.exe b/res/tools/mpg123.x86-sse2.exe new file mode 100644 index 00000000..550e9228 Binary files /dev/null and b/res/tools/mpg123.x86-sse2.exe differ diff --git a/src/Config.h b/src/Config.h index 51a3a910..95e724da 100644 --- a/src/Config.h +++ b/src/Config.h @@ -34,8 +34,8 @@ #define VER_LAMEXP_MINOR_HI 1 #define VER_LAMEXP_MINOR_LO 8 #define VER_LAMEXP_TYPE Alpha -#define VER_LAMEXP_PATCH 1 -#define VER_LAMEXP_BUILD 2190 +#define VER_LAMEXP_PATCH 2 +#define VER_LAMEXP_BUILD 2192 #define VER_LAMEXP_CONFG 2188 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Tools.h b/src/Tools.h index b5c44723..9e764219 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -91,9 +91,10 @@ g_lamexp_tools[] = {"8b1bd63008aa1ec5eb4e3ce10dba6d6d451b7967a6fc2b1203e95b03d589c716456a2e6bba557f2dbe8b65fc54c4c657", CPU_TYPE_X86_SSX, "mediainfo.sse2.exe", 1805, ""}, {"5d419df0e0e82532ec0e74203cc026c3ee7d907b381e5b9f844c67cda78ffc9a068522fcc64e3cccec9b4b4b2b27fb5b", CPU_TYPE_X64_ALL, "mediainfo.x64.exe", 1805, ""}, {"7e6346a057634ff07b2e1f427035324f7f02100cc996425990f87f71d767fce4c7b101588c7d944ba49cb2d7e51c9bdb", CPU_TYPE_ALL_ALL, "mpcdec.exe", 475, ""}, - {"54d45af70bb6f251634dbdd0de10269cac2c2e803d94623a96279b31fb7506e2b68a65fd596b19223ab3026bcbb87c22", CPU_TYPE_ALL_GEN, "mpg123.i686.exe", 12510, ""}, - {"efc53e539aab547e79b4e9be5f19be98896cf2571b9ecfdb70fa05c4972451baf6e9cdf75ec3d5bb420dde3d3165f8bf", CPU_TYPE_ALL_SSE, "mpg123.sse2.exe", 12510, ""}, - {"53bd4d5c570a5a368205cb585759d4d046378918b58acda1c5d720fdb78f44370b71d0f2ee56a24f3a78cfea8d635c00", CPU_TYPE_ALL_AVX, "mpg123.avx.exe", 12510, ""}, + {"1faa3c677aafeb7d523c62417dbe4c1e8c7ad16a9936665bdf539975cf34c4edc326f5f633b4effc8f2fb58841cd9741", CPU_TYPE_X86_GEN, "mpg123.x86-i686.exe", 12510, ""}, + {"a3f9907473846c01a00452a459854d14a2d7310a7e415bda7e64c9dbd3a6a4b71b1be1bdebf21e3628a647d25eecc27c", CPU_TYPE_X86_SSX, "mpg123.x86-sse2.exe", 12510, ""}, + {"8ea26b884b74eaf1977744e913ebfce1b213105d998d30fef584d103e36b391fd6665af3dbf1e05894a31e8280768b8b", CPU_TYPE_X64_NVX, "mpg123.x64-sse2.exe", 12510, ""}, + {"ce1b38582c6bd7dab353589d8a91074657583340e023574d158c861d1a0864d7139b8bf1765ac9b92e4617fcf6fdb30b", CPU_TYPE_X64_AVX, "mpg123.x64-avx.exe", 12510, ""}, {"8e9b65f4bee39deceb303e5fdfe6875872fe450e29151ef3546128e7133a8eb3d14daae446e0c17c56ad3b969294367c", CPU_TYPE_ALL_GEN, "oggdec.i686.exe", 1101, ""}, {"5fb1d7781de9449eed958a175305a9827b158f69cd83131da6b92cd78ee7ea3dcc47ed6b3ee58e2892fe6cf98a994730", CPU_TYPE_ALL_SSE, "oggdec.sse2.exe", 1101, ""}, {"1f1f52553703afc11a428a4d5c9211f91cf9d39019ade3e049478e5a853b9a8c0a0d11304a04feb3a37cac6904244bab", CPU_TYPE_ALL_AVX, "oggdec.avx.exe", 1101, ""},