diff --git a/etc/setup/setup.nsi b/etc/setup/setup.nsi index e0f7871..265b890 100644 --- a/etc/setup/setup.nsi +++ b/etc/setup/setup.nsi @@ -40,9 +40,6 @@ !ifndef X264_SOURCE_PATH !error "X264_SOURCE_PATH is not defined !!!" !endif -!ifndef X264_UPX_PATH - !error "X264_UPX_PATH is not defined !!!" -!endif ;UUID !define MyRegPath "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{986E454F-DACA-4326-A9C7-3E46C0BFFDCE}" @@ -59,7 +56,7 @@ ;-------------------------------- !tempfile PACKHDRTEMP -!packhdr "${PACKHDRTEMP}" '"..\mt.exe" -manifest "setup.manifest" -outputresource:"${PACKHDRTEMP};1"' +!packhdr "${PACKHDRTEMP}" '"..\..\..\Prerequisites\MSVC\redist\bin\mt.exe" -manifest "setup.manifest" -outputresource:"${PACKHDRTEMP};1" && "..\..\..\Prerequisites\UPX\upx.exe" --brute "${PACKHDRTEMP}"' ;-------------------------------- @@ -93,8 +90,6 @@ InstallDirRegKey HKLM "${MyRegPath}" "InstallLocation" SetCompressor /SOLID LZMA SetCompressorDictSize 64 -!packhdr "$%TEMP%\exehead.tmp" '"${X264_UPX_PATH}" --brute "$%TEMP%\exehead.tmp"' - ;-------------------------------- ;Reserved Files diff --git a/src/version.h b/src/version.h index 24f93e6..fee1f39 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 7 #define VER_X264_PATCH 7 -#define VER_X264_BUILD 1072 +#define VER_X264_BUILD 1073 #define VER_X264_PORTABLE_EDITION (0) diff --git a/z_build.bat b/z_build.bat index 00d57b2..33f1921 100644 --- a/z_build.bat +++ b/z_build.bat @@ -172,7 +172,7 @@ echo. >> "%PACK_PATH%\BUILD_TAG.txt" REM /////////////////////////////////////////////////////////////////////////// REM // Build the installer REM /////////////////////////////////////////////////////////////////////////// -"%~dp0\..\Prerequisites\NSIS\makensis.exe" "/DX264_UPX_PATH=%~dp0\..\Prerequisites\UPX\upx.exe" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.sfx" "/DX264_SOURCE_PATH=%PACK_PATH%" "%~dp0\etc\setup\setup.nsi" +"%~dp0\..\Prerequisites\NSIS\makensis.exe" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.sfx" "/DX264_SOURCE_PATH=%PACK_PATH%" "%~dp0\etc\setup\setup.nsi" if not "%ERRORLEVEL%"=="0" goto BuildError call "%~dp0\..\Prerequisites\SevenZip\7zSD.cmd" "%OUT_PATH%.sfx" "%OUT_PATH%.exe" "Simple x264/x265 Launcher" "x264_launcher-setup-r%BUILD_NO%"