Scripts/Windows: Test x32 and x64 builds w/ ffmpeg 2.x !

1 files changed, 6 insertions, 3 deletions

diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index 6f262eb5f..1c646fd37 100755
--- a/make/scripts/tests-x32.bat
+++ b/make/scripts/tests-x32.bat
@@ -7,15 +7,18 @@ set ANT_PATH=C:\apache-ant-1.8.2
 set PROJECT_ROOT=D:\projects\jogamp\jogl

 set BLD_DIR=..\%BLD_SUB%

 

+REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc53_lavf53_lavu51-ffmpeg\x32

+set FFMPEG_LIB=C:\ffmpeg_libav\lavc55_lavf55_lavu52-ffmpeg\x32

+REM set FFMPEG_LIB=C:\ffmpeg_libav\lavc54_lavf54_lavu52_lavr01-libav\x32

+

 REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PATH%

 REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20120127;%PATH%

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20121010-chrome;%PATH%

+REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\angle\win32\20121010-chrome;%PATH%

 REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PROJECT_ROOT%\make\lib\external\PVRVFrame\OGLES-2.0\Windows_x86_32;%PATH%

+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%FFMPEG_LIB%;%PATH%

 

 set BLD_DIR=..\%BLD_SUB%

 REM set LIB_DIR=..\..\gluegen\%BLD_SUB%\obj;%BLD_DIR%\lib

-REM set FFMPEG_LIB=%PROJECT_ROOT%\make\lib\ffmpeg\x32

-REM set LIB_DIR=%FFMPEG_LIB%

 set LIB_DIR=

 

 set CP_ALL=.;%BLD_DIR%\jar\jogl-all.jar;%BLD_DIR%\jar\jogl-test.jar;..\..\gluegen\%BLD_SUB%\gluegen-rt.jar;..\..\gluegen\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;%BLD_DIR%\..\make\lib\swt\win32-win32-x86\swt-debug.jar