diff --git a/res/icons/movie.gif b/res/icons/movie.gif new file mode 100644 index 0000000..ff20ca0 Binary files /dev/null and b/res/icons/movie.gif differ diff --git a/src/version.h b/src/version.h index 1dd660b..da8571f 100644 --- a/src/version.h +++ b/src/version.h @@ -22,7 +22,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 0 #define VER_X264_PATCH 7 -#define VER_X264_BUILD 397 +#define VER_X264_BUILD 403 #define VER_X264_MINIMUM_REV 2223 #define VER_X264_CURRENT_API 129 diff --git a/z_build.bat b/z_build.bat index a6f1a35..95a963d 100644 --- a/z_build.bat +++ b/z_build.bat @@ -60,9 +60,9 @@ REM /////////////////////////////////////////////////////////////////////////// echo --------------------------------------------------------------------- echo BEGIN BUILD echo --------------------------------------------------------------------- -MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher.sln" +MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2010.sln" if not "%ERRORLEVEL%"=="0" goto BuildError -MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher.sln" +MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher_MSVC2010.sln" if not "%ERRORLEVEL%"=="0" goto BuildError REM /////////////////////////////////////////////////////////////////////////// @@ -91,7 +91,11 @@ copy "%~dp0\*.txt" "%PACK_PATH%" REM /////////////////////////////////////////////////////////////////////////// REM // Copy dependencies REM /////////////////////////////////////////////////////////////////////////// -copy "%MSVC_PATH%\redist\x86\Microsoft.VC100.CRT\*.dll" "%PACK_PATH%" +for %%i in (100, 110) do ( + if exist "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\*.dll" ( + copy "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\msvc?%%i.dll" "%PACK_PATH%" + ) +) copy "%QTVC_PATH%\bin\QtCore4.dll" "%PACK_PATH%" copy "%QTVC_PATH%\bin\QtGui4.dll" "%PACK_PATH%" copy "%QTVC_PATH%\bin\QtSvg4.dll" "%PACK_PATH%"