diff --git a/LameXP_VS2017.vcxproj b/LameXP_VS2017.vcxproj index bca4d1d1..bbc0e699 100644 --- a/LameXP_VS2017.vcxproj +++ b/LameXP_VS2017.vcxproj @@ -402,67 +402,250 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + @@ -1039,6 +1222,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" @@ -1050,6 +1235,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" @@ -1062,6 +1249,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) Designer + true + true RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" @@ -1074,6 +1263,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) Designer + true + true RCC "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" @@ -1088,6 +1279,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp" -no-compress -name "%(Filename)" "%(FullPath)" %(AdditionalInputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1214,6 +1407,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1226,6 +1421,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1238,6 +1435,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1250,6 +1449,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1262,6 +1463,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1274,6 +1477,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1286,6 +1491,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1298,6 +1505,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1310,6 +1519,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1322,6 +1533,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1334,6 +1547,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1346,6 +1561,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1358,6 +1575,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1370,6 +1589,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1382,6 +1603,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1394,6 +1617,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1406,6 +1631,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1418,6 +1645,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1430,6 +1659,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1442,6 +1673,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1454,6 +1687,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1466,6 +1701,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1478,6 +1715,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1490,6 +1729,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1502,6 +1743,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1514,6 +1757,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1526,6 +1771,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1538,6 +1785,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1550,6 +1799,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1562,6 +1813,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1574,6 +1827,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1586,6 +1841,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1598,6 +1855,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1610,6 +1869,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1622,6 +1883,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1634,6 +1897,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1646,6 +1911,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1658,6 +1925,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1670,6 +1939,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1682,6 +1953,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1694,6 +1967,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1706,6 +1981,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1718,6 +1995,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1730,6 +2009,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1742,6 +2023,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1754,6 +2037,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1766,6 +2051,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1778,6 +2065,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i "$(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 Document @@ -1790,6 +2079,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1802,6 +2093,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1814,6 +2107,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1826,6 +2121,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1838,6 +2135,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1850,6 +2149,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1862,6 +2163,8 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true Document @@ -1874,6 +2177,21 @@ copy /Y "$(SolutionDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\plugins\i $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\$(ProjectName)\QRC_%(Filename).cpp;%(Outputs) + true + true + + + Document + "$(QTDIR)\bin\rcc.exe" -binary -o "$(OutDir)LameXP.rcc" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -binary -o "$(OutDir)LameXP.rcc" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -binary -o "$(OutDir)LameXP.rcc" -name "%(Filename)" "%(FullPath)" + RCC "$(OutDir)LameXP.rcc" + RCC "$(OutDir)LameXP.rcc" + RCC "$(OutDir)LameXP.rcc" + $(OutDir)LameXP.rcc;%(Outputs) + $(OutDir)LameXP.rcc;%(Outputs) + $(OutDir)LameXP.rcc;%(Outputs) + true diff --git a/LameXP_VS2017.vcxproj.filters b/LameXP_VS2017.vcxproj.filters index 9565f700..7d8a40a7 100644 --- a/LameXP_VS2017.vcxproj.filters +++ b/LameXP_VS2017.vcxproj.filters @@ -1061,6 +1061,9 @@ Miscellaneous + + Resources + diff --git a/res/_ALL.qrc b/res/_ALL.qrc new file mode 100644 index 00000000..c4b1d9ef --- /dev/null +++ b/res/_ALL.qrc @@ -0,0 +1,270 @@ + + + + + ../doc/Changelog.html + ../doc/Manual.html + ../doc/Translate.html + ../License.txt + flags/de.png + flags/en.png + flags/es.png + flags/fr.png + flags/hu.png + flags/it.png + flags/kr.png + flags/pl.png + flags/ru.png + flags/sv.png + flags/tw.png + flags/uk.png + flags/zh.png + MainIcon.ico + MainIcon1.png + MainIcon2.png + MainIcon3.png + MainIcon4.png + MainIcon5.png + MainIcon6.png + icons/add.png + icons/accept.png + icons/application_view_list.png + icons/application_xp_terminal.png + icons/arrow_down.png + icons/arrow_up.png + icons/arrow_refresh.png + icons/bell.png + icons/bin.png + icons/bomb.png + icons/bug.png + icons/calendar.png + icons/cancel.png + icons/cd.png + icons/cd_add.png + icons/cd_burn.png + icons/cd_delete.png + icons/cd_edit.png + icons/cd_go.png + icons/clock.png + icons/clock_play.png + icons/cog.png + icons/comment.png + icons/compress.png + icons/computer.png + icons/controller.png + icons/control_pause_blue.png + icons/control_play_blue.png + icons/cpu.png + icons/cross.png + icons/date.png + icons/delete.png + icons/disk.png + icons/door_out.png + icons/door_in.png + icons/drive.png + icons/drive_cd.png + icons/drive_disk.png + icons/drive_edit.png + icons/drive_link.png + icons/drive_network.png + icons/exclamation.png + icons/exclamation_small.png + icons/error.png + icons/error_big.png + icons/feed.png + icons/film.png + icons/filter.png + icons/find.png + icons/folder.png + icons/folder_add.png + icons/folder_go.png + icons/folder_image.png + icons/folder_explore.png + icons/folder_page.png + icons/folder_table.png + icons/folder_up.png + icons/font.png + icons/group.png + icons/heart.png + icons/help.png + icons/house.png + icons/hourglass.png + icons/information.png + icons/lightning.png + icons/media_play.png + icons/memory.png + icons/money_dollar.png + icons/monitor.png + icons/music.png + icons/network.png + icons/network_error.png + icons/palette.png + icons/package.png + icons/page_edit.png + icons/page_refresh.png + icons/page_white_cplusplus.png + icons/page_white_add.png + icons/page_white_cd.png + icons/page_white_copy.png + icons/paste_plain.png + icons/photo.png + icons/picture.png + icons/play.png + icons/power_off.png + icons/power_on.png + icons/qt.png + icons/report.png + icons/resultset_next.png + icons/script.png + icons/script_edit.png + icons/script_go.png + icons/server_database.png + icons/server_error.png + icons/shield_admin.png + icons/shield_blue.png + icons/shield_error.png + icons/shield_exclamation.png + icons/shield_green.png + icons/sound.png + icons/step_over.png + icons/star.png + icons/table_edit.png + icons/table_save.png + icons/tag_blue.png + icons/tag_red.png + icons/tick.png + icons/timeline_marker.png + icons/transmit.png + icons/transmit_blue.png + icons/user.png + icons/user_gray.png + icons/user_suit.png + icons/user_comment.png + icons/wma.png + icons/world.png + icons/wrench.png + icons/zoom.png + images/Announcement.png + images/Background.jpg + images/Busy.gif + images/Cartoon.png + images/CD.png + images/Clock.png + images/Disque.png + images/DropBox.png + images/DropZone.png + images/HeaderIcon_CueImport.png + images/HeaderIcon_LogFile.png + images/HeaderIcon_MetaInfo.png + images/Label.png + images/Loading.gif + images/Loading2.gif + images/Loading3.gif + images/Loading4.gif + images/Logo.png + images/Logo_Contributors.png + images/Logo_GNU.png + images/Logo_Software.png + images/Qt.svg + images/Sound.png + images/Starting.png + images/Thumb.png + images/Wizard.png + images/Working.gif + localization/LameXP_DE.qm + localization/LameXP_DE.qm.txt + localization/LameXP_EN.qm + localization/LameXP_EN.qm.txt + localization/LameXP_FR.qm + localization/LameXP_FR.qm.txt + localization/LameXP_HU.qm + localization/LameXP_HU.qm.txt + localization/LameXP_IT.qm + localization/LameXP_IT.qm.txt + localization/LameXP_ES.qm + localization/LameXP_ES.qm.txt + localization/LameXP_KR.qm + localization/LameXP_KR.qm.txt + localization/LameXP_PL.qm + localization/LameXP_PL.qm.txt + localization/LameXP_RU.qm + localization/LameXP_RU.qm.txt + localization/LameXP_SV.qm + localization/LameXP_SV.qm.txt + localization/LameXP_TW.qm + localization/LameXP_TW.qm.txt + localization/LameXP_UK.qm + localization/LameXP_UK.qm.txt + localization/LameXP_ZH.qm + localization/LameXP_ZH.qm.txt + sounds/aborted.wav + sounds/beep.wav + sounds/beep2.wav + sounds/blast.wav + sounds/chicken.wav + sounds/drop.wav + sounds/error.wav + sounds/ghost.wav + sounds/shutdown.wav + sounds/success.wav + sounds/tick.wav + sounds/waiting.wav + sounds/whammy.wav + sounds/woohoo.wav + tools/aften.i686.exe + tools/aften.sse2.exe + tools/aften.x64.exe + tools/avs2wav.exe + tools/dcaenc.exe + tools/elevator.exe + tools/faad.i686.exe + tools/faad.sse2.exe + tools/flac.x64-avx.exe + tools/flac.x64-sse2.exe + tools/flac.x86-i686.exe + tools/flac.x86-sse2.exe + tools/gpgv.exe + tools/keyring.gpg + tools/lame.x64-avx.exe + tools/lame.x64-sse2.exe + tools/lame.x86-i686.exe + tools/lame.x86-sse2.exe + tools/mac.avx.exe + tools/mac.i686.exe + tools/mac.sse2.exe + tools/mcat.exe + tools/mediainfo.i686.exe + tools/mediainfo.sse2.exe + tools/mediainfo.x64.exe + tools/mpcdec.exe + tools/mpg123.avx.exe + tools/mpg123.i686.exe + tools/mpg123.sse2.exe + tools/oggdec.exe + tools/oggenc2.i686.exe + tools/oggenc2.sse2.exe + tools/oggenc2.x64.exe + tools/opusdec.avx.exe + tools/opusdec.i686.exe + tools/opusdec.sse2.exe + tools/opusenc.avx.exe + tools/opusenc.i686.exe + tools/opusenc.sse2.exe + tools/refalac.i686.exe + tools/refalac.x64.exe + tools/shorten.exe + tools/sox.avx.exe + tools/sox.i686.exe + tools/sox.sse2.exe + tools/speexdec.exe + tools/tag.exe + tools/tta.exe + tools/valdec.exe + tools/vorbiscomment.exe + tools/wget.exe + tools/wma2wav.exe + tools/wupdate.exe + tools/wvunpack.i686.exe + tools/wvunpack.x64.exe + + \ No newline at end of file diff --git a/res/z_mkallin1.bat b/res/z_mkallin1.bat new file mode 100644 index 00000000..38c224c9 --- /dev/null +++ b/res/z_mkallin1.bat @@ -0,0 +1,5 @@ +@echo off +cd /d "%~dp0" + +"%~dp0\..\..\Prerequisites\QRCMerger\QRCMerger.exe" "%~dp0\." "%~dp0\_ALL.qrc" +pause diff --git a/src/Config.h b/src/Config.h index e1861728..03486efc 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 6 #define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_PATCH 2 -#define VER_LAMEXP_BUILD 2006 +#define VER_LAMEXP_BUILD 2008 #define VER_LAMEXP_CONFG 2002 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Global.h b/src/Global.h index 5fcffe4d..00566d91 100644 --- a/src/Global.h +++ b/src/Global.h @@ -63,7 +63,6 @@ unsigned int lamexp_toolver_neroaac (void); unsigned int lamexp_toolver_fhgaacenc(void); unsigned int lamexp_toolver_fdkaacenc(void); unsigned int lamexp_toolver_qaacenc (void); -unsigned int lamexp_toolver_coreaudio(void); /* * URL getters @@ -73,6 +72,11 @@ const char *lamexp_mulders_url(void); const char *lamexp_support_url(void); const char *lamexp_tracker_url(void); +/* +* Resources +*/ +void lamexp_initialize_resources(void); + /* * Misc Functions */ diff --git a/src/Global_Tools.cpp b/src/Global_Tools.cpp index a23643ea..3c8756da 100644 --- a/src/Global_Tools.cpp +++ b/src/Global_Tools.cpp @@ -33,6 +33,8 @@ #include #include #include +#include +#include //MUtils #include @@ -60,6 +62,10 @@ static const QString g_null_string; //UINT_MAX static const quint32 g_max_uint32 = UINT32_MAX; + +//Resource file lock +static QScopedPointer g_lamexp_rcc_lock; + //Helper Macro #define MAKE_ENTRY(LOCK_FILE,VER,TAG) \ qMakePair((LOCK_FILE),qMakePair((VER),(TAG))) @@ -176,3 +182,34 @@ const quint32 &lamexp_tools_version(const QString &toolName, QString *const tagO } return g_max_uint32; } + +/* +* Initialize external resources (RCC file) +*/ +void lamexp_initialize_resources(void) +{ + //Load the external RCC file +#ifndef QT_NODLL + if (g_lamexp_rcc_lock.isNull()) + { + const QFileInfo appPath(QCoreApplication::applicationFilePath()); + const QString rccPath = QString("%1/%2.rcc").arg(appPath.canonicalPath(), appPath.completeBaseName()); + try + { + qDebug("Using resource file:\n%s\n", MUTILS_UTF8(rccPath)); + g_lamexp_rcc_lock.reset(new LockedFile(rccPath)); + QResource::registerResource(g_lamexp_rcc_lock->filePath()); + } + catch (std::runtime_error&) + { + qFatal("Failed to load the resource file:\n%s\n", MUTILS_UTF8(QDir::toNativeSeparators(rccPath))); + } + } +#endif //!QT_NODLL + + //Make sure resources are accessible! + if (!QResource(":/images/Logo.png").isValid()) + { + qFatal("Qt resource system initialization has failed!"); + } +} diff --git a/src/Main.cpp b/src/Main.cpp index 3839accb..1892d39d 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -226,6 +226,9 @@ static int lamexp_main(int &argc, char **argv) application->setWindowIcon(lamexp_app_icon()); application->setApplicationVersion(QString().sprintf("%d.%02d.%04d", lamexp_version_major(), lamexp_version_minor(), lamexp_version_build())); + //Initialize resources + lamexp_initialize_resources(); + //Check for expiration if(lamexp_version_demo()) {