diff --git a/src/encoder_nvencc.cpp b/src/encoder_nvencc.cpp index 1fc40f1..0aa4628 100644 --- a/src/encoder_nvencc.cpp +++ b/src/encoder_nvencc.cpp @@ -40,7 +40,7 @@ #include //x265 version info -static const unsigned int VERSION_NVENCC_MINIMUM_VER = 401; +static const unsigned int VERSION_NVENCC_MINIMUM_VER = 436; // ------------------------------------------------------------ // Helper Macros @@ -172,7 +172,7 @@ public: case 1: break; default: MUTILS_THROW("Unknown encoder variant!"); } - return QString("%1/toolset/%2/nvencc_%2.exe").arg(sysinfo->getAppPath(), arch); + return QString("%1/toolset/%2/nvencc/nvencc_%2.exe").arg(sysinfo->getAppPath(), arch); } virtual QStringList getDependencies(const SysinfoModel *sysinfo, const quint32 &encArch, const quint32 &encVariant) const diff --git a/x264_launcher_MSVC2017.vcxproj b/x264_launcher_MSVC2017.vcxproj index f22b021..fe43fc4 100644 --- a/x264_launcher_MSVC2017.vcxproj +++ b/x264_launcher_MSVC2017.vcxproj @@ -75,17 +75,23 @@ rmdir /S /Q "$(TargetDir)\toolset" rmdir /S /Q "$(TargetDir)\imageformats" +mkdir "$(TargetDir)\toolset\common" mkdir "$(TargetDir)\toolset\x86" mkdir "$(TargetDir)\toolset\x64" -mkdir "$(TargetDir)\toolset\common" +mkdir "$(TargetDir)\toolset\x86\nvencc" +mkdir "$(TargetDir)\toolset\x64\nvencc" mkdir "$(TargetDir)\imageformats" -copy /Y "$(SolutionDir)res\toolset\x86\*.exe" "$(TargetDir)\toolset\x86\" -copy /Y "$(SolutionDir)res\toolset\x86\*.dll" "$(TargetDir)\toolset\x86\" -copy /Y "$(SolutionDir)res\toolset\x64\*.exe" "$(TargetDir)\toolset\x64\" -copy /Y "$(SolutionDir)res\toolset\x64\*.dll" "$(TargetDir)\toolset\x64\" copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\" copy /Y "$(SolutionDir)res\toolset\common\*.gpg" "$(TargetDir)\toolset\common\" +copy /Y "$(SolutionDir)res\toolset\x86\*.exe" "$(TargetDir)\toolset\x86\" +copy /Y "$(SolutionDir)res\toolset\x64\*.exe" "$(TargetDir)\toolset\x64\" +copy /Y "$(SolutionDir)res\toolset\x86\*.dll" "$(TargetDir)\toolset\x86\" +copy /Y "$(SolutionDir)res\toolset\x64\*.dll" "$(TargetDir)\toolset\x64\" +copy /Y "$(SolutionDir)res\toolset\x86\nvencc\*.exe" "$(TargetDir)\toolset\x86\nvencc" +copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.exe" "$(TargetDir)\toolset\x64\nvencc" +copy /Y "$(SolutionDir)res\toolset\x86\nvencc\*.dll" "$(TargetDir)\toolset\x86\nvencc" +copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.dll" "$(TargetDir)\toolset\x64\nvencc" for %%i in (QtCored4, QtGuid4, QtSvgd4, QtXmld4) do ( copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Debug\bin\%%i.dll" "$(TargetDir)" @@ -161,17 +167,23 @@ copy /Y "$(SolutionDir)\..\Prerequisites\VisualLeakDetector\bin\$(Platform)\*.ma rmdir /S /Q "$(TargetDir)\toolset" rmdir /S /Q "$(TargetDir)\imageformats" +mkdir "$(TargetDir)\toolset\common" mkdir "$(TargetDir)\toolset\x86" mkdir "$(TargetDir)\toolset\x64" -mkdir "$(TargetDir)\toolset\common" +mkdir "$(TargetDir)\toolset\x86\nvencc" +mkdir "$(TargetDir)\toolset\x64\nvencc" mkdir "$(TargetDir)\imageformats" +copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\" +copy /Y "$(SolutionDir)res\toolset\common\*.gpg" "$(TargetDir)\toolset\common\" copy /Y "$(SolutionDir)res\toolset\x86\*.exe" "$(TargetDir)\toolset\x86\" copy /Y "$(SolutionDir)res\toolset\x64\*.exe" "$(TargetDir)\toolset\x64\" copy /Y "$(SolutionDir)res\toolset\x86\*.dll" "$(TargetDir)\toolset\x86\" copy /Y "$(SolutionDir)res\toolset\x64\*.dll" "$(TargetDir)\toolset\x64\" -copy /Y "$(SolutionDir)res\toolset\common\*.exe" "$(TargetDir)\toolset\common\" -copy /Y "$(SolutionDir)res\toolset\common\*.gpg" "$(TargetDir)\toolset\common\" +copy /Y "$(SolutionDir)res\toolset\x86\nvencc\*.exe" "$(TargetDir)\toolset\x86\nvencc" +copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.exe" "$(TargetDir)\toolset\x64\nvencc" +copy /Y "$(SolutionDir)res\toolset\x86\nvencc\*.dll" "$(TargetDir)\toolset\x86\nvencc" +copy /Y "$(SolutionDir)res\toolset\x64\nvencc\*.dll" "$(TargetDir)\toolset\x64\nvencc" copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\bin\QtCore4.dll" "$(TargetDir)" copy /Y "$(ProjectDir)\..\Prerequisites\Qt4\$(PlatformToolset)\Shared\bin\QtGui4.dll" "$(TargetDir)" diff --git a/z_build.bat b/z_build.bat index 36a1717..c98d1bc 100644 --- a/z_build.bat +++ b/z_build.bat @@ -98,21 +98,27 @@ echo --------------------------------------------------------------------- set "PACK_PATH=%TMP%\~%RANDOM%%RANDOM%.tmp" mkdir "%PACK_PATH%" mkdir "%PACK_PATH%\imageformats" +mkdir "%PACK_PATH%\toolset\common" mkdir "%PACK_PATH%\toolset\x86" mkdir "%PACK_PATH%\toolset\x64" -mkdir "%PACK_PATH%\toolset\common" +mkdir "%PACK_PATH%\toolset\x86\nvencc" +mkdir "%PACK_PATH%\toolset\x64\nvencc" mkdir "%PACK_PATH%\sources" -copy "%~dp0\bin\Win32\Release\x264_launcher.exe" "%PACK_PATH%" -copy "%~dp0\bin\Win32\Release\MUtils32-?.dll" "%PACK_PATH%" -copy "%~dp0\bin\Win32\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86" -copy "%~dp0\bin\Win32\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86" -copy "%~dp0\bin\Win32\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64" -copy "%~dp0\bin\Win32\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64" -copy "%~dp0\bin\Win32\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common" -copy "%~dp0\bin\Win32\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common" -copy "%~dp0\etc\sources\*.xz" "%PACK_PATH%\sources" -copy "%~dp0\LICENSE.html" "%PACK_PATH%" -copy "%~dp0\*.txt" "%PACK_PATH%" +copy "%~dp0\bin\Win32\Release\x264_launcher.exe" "%PACK_PATH%" +copy "%~dp0\bin\Win32\Release\MUtils32-?.dll" "%PACK_PATH%" +copy "%~dp0\bin\Win32\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common" +copy "%~dp0\bin\Win32\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common" +copy "%~dp0\bin\Win32\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86" +copy "%~dp0\bin\Win32\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86" +copy "%~dp0\bin\Win32\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64" +copy "%~dp0\bin\Win32\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64" +copy "%~dp0\bin\Win32\Release\toolset\x86\nvencc\*.exe" "%PACK_PATH%\toolset\x86\nvencc\" +copy "%~dp0\bin\Win32\Release\toolset\x86\nvencc\*.dll" "%PACK_PATH%\toolset\x86\nvencc\" +copy "%~dp0\bin\Win32\Release\toolset\x64\nvencc\*.exe" "%PACK_PATH%\toolset\x64\nvencc\" +copy "%~dp0\bin\Win32\Release\toolset\x64\nvencc\*.dll" "%PACK_PATH%\toolset\x64\nvencc\" +copy "%~dp0\etc\sources\*.xz" "%PACK_PATH%\sources" +copy "%~dp0\LICENSE.html" "%PACK_PATH%" +copy "%~dp0\*.txt" "%PACK_PATH%" REM /////////////////////////////////////////////////////////////////////////// REM // Copy dependencies