From 6a2c9e463f873d102aa2b185fcf868e2f0770f21 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Wed, 5 Dec 2012 22:51:27 +0100 Subject: [PATCH] Updated build script. --- res/icons/movie.gif | Bin 0 -> 1533 bytes src/version.h | 2 +- z_build.bat | 10 +++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 res/icons/movie.gif diff --git a/res/icons/movie.gif b/res/icons/movie.gif new file mode 100644 index 0000000000000000000000000000000000000000..ff20ca053c5b1c9e9e8edf05e4e393ad6a4a2cab GIT binary patch literal 1533 zcmVF7akxXB@PWD6B8jD87&+WI0^?p92+ho z7bGMkEG#T9GBQ6rEHW}OJ3KrvIdD5x3O!g4IYuQuLPA;<1YHvlKq)A54G3l|6?PyS zW-KRTJ}*H@H%vu1Lsu+JS2t5eJxOF5O=%iYZW~l}8&zvFYfm?ATqApGDRX8xLqtSO zOiWHtO;kogQd3h_S6NqBSz1_DTU=a2OMG2jWK&mjW^Pw%aa(q6M{;jWV`F1yXK8C| zYin+DZ*X*Xb!~HVbaQojcX@t%e0?-Rj5kP}I7pdFQh`8Ju1Q|JS8cXuZGmrgk9K#0 zd3=L>eu`3R(^_@iV}ILSjs{+h3s{E~Uy=oBo(gB08)$_vYL*~-pEhi!26MFld%psD zy9joKTYZ~NeS&m(f|6&0H>KbluNk#q!+b_tq& z1cZ1>hJR_HZA77RM!0%K#S{R^6amf}0MQ%($RYs2G7;A#1>7M3;UfU(CIId#0QfEd z`!fOmI0XMb2+vCy!c!{3Xf*dj4F5w7@kkN>OB4T98~<7#|6e2jWGDY+DF1CP_ir)( zb~gQbIf1Szpn?aaiy)4QdZL(WyRCMis;R54tgNiBud=bRv9hzZwY9ahwYayqy}P@+!NI}B#l^?Q$;ZgZ z%gf8o&d|@$(9zM+)z#J5*VNe9*4x|L;o;%qFMe1?d|jP^Zfk$00000 z0000000000A^8LW00930EC2ui03ZM$000R80RIUbNKoLmGR&xXE6A{+!(!p!;k%cP znl^_R$5lfX4cotD?Dpluw{M@mZo)7!yvDBHJapZNbdz^Xh>&CVOm>r|av(C2`|zbZ zCoWoy2ur3gX>zV4vTHrRtsDwz+J0>L<$-zPU7uzSEOe(efjjkYrufTQ*g|Z z9GQZ~Of!2YiK!H)uWvdA4;~1)MlIbFBTCSmQPy+aB9*e+((d~P8qec`? zzqrxUS8SL=V&@<*C~^-O0|-ULFZXs69RGywJhJnyUk$1AM_F&#C?G^C9-=%mArWIl8=j}Hwz zzyLM((2>FpV}v4xI@buuP%-F`gUmVXkV6hU*968uH24S;0vDvH(nU5gIwZ_ELM+fi zS|7ec4GS(*_KXQ$h=PhKIrt!iL(EunA34l<_)drO%=1hMS$r}|Dwnt*BSS(6!vF)q z?Bfj!Lg4rgJZh4Fg(sqva>^DqU<5@qEG&>`G=TZ=Av^FmGeQ+$xCzP$FYtg-5$hl` z&ptf{Rv2XDmM;sy*3QA1`);`m4nItbz*ffZMP&;cTp%u-7oB3Q?e zFq(-Z#GTQc1Cs|7IKV+4iZ~KUC9~WjiybJ;z|at*G6zEo-H?+G6c}v4h983z(#Ru| zSVGG!xWFR7mjwyK*FD{MBhERt6%c}5MGVn|F)?9b(P(T1X0L-e( literal 0 HcmV?d00001 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%"