From fd689aeb70a6901a8c6e38c7e7e2401629718a27 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Mon, 2 Feb 2015 22:18:40 +0100 Subject: [PATCH] Updated build script. --- src/version.h | 2 +- z_build.bat | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/version.h b/src/version.h index 91a7842..9d7a103 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 4 #define VER_X264_PATCH 6 -#define VER_X264_BUILD 914 +#define VER_X264_BUILD 915 #define VER_X264_PORTABLE_EDITION (0) diff --git a/z_build.bat b/z_build.bat index c76d3bb..d70f16f 100644 --- a/z_build.bat +++ b/z_build.bat @@ -6,6 +6,7 @@ set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 12.0\VC" set "NSIS_PATH=C:\Program Files\NSIS\Unicode" set "QTVC_PATH=C:\Qt\4.8.5" set "UPX3_PATH=C:\Program Files\UPX" +set "PDOC_PATH=C:\Program Files\Pandoc" REM ############################################### REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! # @@ -91,16 +92,17 @@ mkdir "%PACK_PATH%\toolset\x86" mkdir "%PACK_PATH%\toolset\x64" mkdir "%PACK_PATH%\toolset\common" mkdir "%PACK_PATH%\sources" -copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%" -copy "%~dp0\bin\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86" -copy "%~dp0\bin\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86" -copy "%~dp0\bin\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64" -copy "%~dp0\bin\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64" -copy "%~dp0\bin\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common" -copy "%~dp0\bin\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common" -copy "%~dp0\etc\sources\*.tar" "%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\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\*.tar" "%PACK_PATH%\sources" +copy "%~dp0\LICENSE.html" "%PACK_PATH%" +copy "%~dp0\*.txt" "%PACK_PATH%" REM /////////////////////////////////////////////////////////////////////////// REM // Copy dependencies -- 2.11.0