Updated build environment to Visual Studio 2015 with Update-1.

This commit is contained in:
LoRd_MuldeR 2015-12-19 19:18:38 +01:00
parent 83b79ca7ae
commit 9ce8f89c99
3 changed files with 10 additions and 6 deletions

View File

@ -2,6 +2,10 @@
Simple x264/x265 Launcher version history 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] Version 2.62 [2015-11-18]
* Make 'custom' Avs2YUV parameters work again * Make 'custom' Avs2YUV parameters work again
* Changed mode for the Status/Progress columns to "ResizeToContents" * Changed mode for the Status/Progress columns to "ResizeToContents"

View File

@ -25,8 +25,8 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 6 #define VER_X264_MINOR 6
#define VER_X264_PATCH 2 #define VER_X264_PATCH 3
#define VER_X264_BUILD 994 #define VER_X264_BUILD 996
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)

View File

@ -2,11 +2,11 @@
REM /////////////////////////////////////////////////////////////////////////// REM ///////////////////////////////////////////////////////////////////////////
REM // Set Paths REM // Set Paths
REM /////////////////////////////////////////////////////////////////////////// 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 "NSIS_PATH=C:\Program Files\NSIS\Unicode"
set "UPX3_PATH=C:\Program Files\UPX" set "UPX3_PATH=C:\Program Files\UPX"
set "PDOC_PATH=C:\Program Files\Pandoc" set "PDOC_PATH=C:\Program Files\Pandoc"
set "TOOLS_VER=120" set "TOOLS_VER=140"
REM ############################################### REM ###############################################
REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! # REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! #
@ -58,9 +58,9 @@ REM ///////////////////////////////////////////////////////////////////////////
echo --------------------------------------------------------------------- echo ---------------------------------------------------------------------
echo BEGIN BUILD echo BEGIN BUILD
echo --------------------------------------------------------------------- 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 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 if not "%ERRORLEVEL%"=="0" goto BuildError
REM /////////////////////////////////////////////////////////////////////////// REM ///////////////////////////////////////////////////////////////////////////