From 9ce8f89c99fe06b8628d70a1e6aef532f6b47594 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 19 Dec 2015 19:18:38 +0100 Subject: [PATCH] Updated build environment to Visual Studio 2015 with Update-1. --- HISTORY.txt | 4 ++++ src/version.h | 4 ++-- z_build.bat | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/HISTORY.txt b/HISTORY.txt index a9b18ad..6cbe227 100644 --- a/HISTORY.txt +++ b/HISTORY.txt @@ -2,6 +2,10 @@ Simple x264/x265 Launcher version history ----------------------------------------- +Version 2.63 [2015-12-19] +* Updated build environment to Visual Studio 2015 with Update-1 +* Updated x265 to version 1.8+167 + Version 2.62 [2015-11-18] * Make 'custom' Avs2YUV parameters work again * Changed mode for the Status/Progress columns to "ResizeToContents" diff --git a/src/version.h b/src/version.h index 1437246..2e93497 100644 --- a/src/version.h +++ b/src/version.h @@ -25,8 +25,8 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 6 -#define VER_X264_PATCH 2 -#define VER_X264_BUILD 994 +#define VER_X264_PATCH 3 +#define VER_X264_BUILD 996 #define VER_X264_PORTABLE_EDITION (0) diff --git a/z_build.bat b/z_build.bat index c8c98b8..3939e0a 100644 --- a/z_build.bat +++ b/z_build.bat @@ -2,11 +2,11 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Set Paths REM /////////////////////////////////////////////////////////////////////////// -set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 12.0\VC" +set "MSVC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" set "NSIS_PATH=C:\Program Files\NSIS\Unicode" set "UPX3_PATH=C:\Program Files\UPX" set "PDOC_PATH=C:\Program Files\Pandoc" -set "TOOLS_VER=120" +set "TOOLS_VER=140" REM ############################################### REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! # @@ -58,9 +58,9 @@ REM /////////////////////////////////////////////////////////////////////////// echo --------------------------------------------------------------------- echo BEGIN BUILD echo --------------------------------------------------------------------- -MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2013.sln" +MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2015.sln" if not "%ERRORLEVEL%"=="0" goto BuildError -MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher_MSVC2013.sln" +MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher_MSVC2015.sln" if not "%ERRORLEVEL%"=="0" goto BuildError REM ///////////////////////////////////////////////////////////////////////////