From 5591242240395efe6ada2cde8772ee01c74e25e0 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 18 Oct 2013 20:44:07 +0200 Subject: [PATCH] Split resource files even further to speed up compilation. --- LameXP_VS2013.vcxproj | 41 ++++++++++++++++++++++++++++++++++- LameXP_VS2013.vcxproj.filters | 20 +++++++++++++++-- res/Tools_Encd_B.qrc | 2 -- res/Tools_Encd_C.qrc | 6 +++++ res/Tools_Encd_D.qrc | 6 +++++ res/Tools_Misc_B.qrc | 1 - res/Tools_Misc_C.qrc | 6 +++++ 7 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 res/Tools_Encd_C.qrc create mode 100644 res/Tools_Encd_D.qrc create mode 100644 res/Tools_Misc_C.qrc diff --git a/LameXP_VS2013.vcxproj b/LameXP_VS2013.vcxproj index f891273b..28f4086b 100644 --- a/LameXP_VS2013.vcxproj +++ b/LameXP_VS2013.vcxproj @@ -225,7 +225,7 @@ del "$(TargetDir)imageformats\q???d4.dll" "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) QtCore.lib;QtGui.lib;QtSvg.lib;qtmain.lib;qsvg.lib;qico.lib;qtga.lib;Winmm.lib;imm32.lib;ws2_32.lib;Shlwapi.lib;Wininet.lib;PowrProf.lib;psapi.lib;QKeccakHash_VS2013.lib;EncodePointer.lib;%(AdditionalDependencies) LinkVerboseLib - $(SolutionDir)\etc\Prerequisites\qt4_static\lib;$(SolutionDir)\etc\Prerequisites\qt4_static\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories) + $(SolutionDir)\etc\Prerequisites\qt4_static.VS2013\lib;$(SolutionDir)\etc\Prerequisites\qt4_static.VS2013\plugins\imageformats;$(SolutionDir)\etc\Prerequisites\EncodePointer\lib;$(SolutionDir)\etc\Prerequisites\VisualLeakDetector\lib\Win32;$(SolutionDir)\etc\Prerequisites\keccak\lib\$(Configuration);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false @@ -393,8 +393,11 @@ del "$(TargetDir)imageformats\q???d4.dll" + + + @@ -1254,6 +1257,42 @@ del "$(TargetDir)imageformats\q???d4.dll" $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + + + Document + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + "$(QTDIR)\bin\rcc.exe" -o "$(SolutionDir)tmp\QRC_%(Filename).cpp" -name "%(Filename)" "%(FullPath)" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + RCC "$(SolutionDir)tmp\QRC_%(Filename).cpp" + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + $(SolutionDir)tmp\QRC_%(Filename).cpp;%(Outputs) + diff --git a/LameXP_VS2013.vcxproj.filters b/LameXP_VS2013.vcxproj.filters index 14ae8ba5..b7d64f4d 100644 --- a/LameXP_VS2013.vcxproj.filters +++ b/LameXP_VS2013.vcxproj.filters @@ -391,6 +391,15 @@ Generated Files\QRC + + Generated Files\QRC + + + Generated Files\QRC + + + Generated Files\QRC + @@ -716,8 +725,15 @@ Resources - - + + Resources + + + Resources + + + + diff --git a/res/Tools_Encd_B.qrc b/res/Tools_Encd_B.qrc index 5a5eba88..cacd5099 100644 --- a/res/Tools_Encd_B.qrc +++ b/res/Tools_Encd_B.qrc @@ -2,7 +2,5 @@ tools/oggenc2.i386.exe - tools/oggenc2.sse2.exe - tools/oggenc2.x64.exe diff --git a/res/Tools_Encd_C.qrc b/res/Tools_Encd_C.qrc new file mode 100644 index 00000000..c63247ec --- /dev/null +++ b/res/Tools_Encd_C.qrc @@ -0,0 +1,6 @@ + + + + tools/oggenc2.sse2.exe + + diff --git a/res/Tools_Encd_D.qrc b/res/Tools_Encd_D.qrc new file mode 100644 index 00000000..814f41d5 --- /dev/null +++ b/res/Tools_Encd_D.qrc @@ -0,0 +1,6 @@ + + + + tools/oggenc2.x64.exe + + diff --git a/res/Tools_Misc_B.qrc b/res/Tools_Misc_B.qrc index bf4793f8..00ca3885 100644 --- a/res/Tools_Misc_B.qrc +++ b/res/Tools_Misc_B.qrc @@ -2,6 +2,5 @@ tools/mediainfo.i386.exe - tools/mediainfo.x64.exe diff --git a/res/Tools_Misc_C.qrc b/res/Tools_Misc_C.qrc new file mode 100644 index 00000000..4d011371 --- /dev/null +++ b/res/Tools_Misc_C.qrc @@ -0,0 +1,6 @@ + + + + tools/mediainfo.x64.exe + +