appveyor: simplify how to use ffmpeg install

Clement Champetier · Clement Champetier · commit 38b014c9cbda · 2015-11-16T10:15:19.000+01:00
diff --git a/tools/appveyor.build.bat b/tools/appveyor.build.bat
@@ -2,14 +2,11 @@
 
 set FFMPEG_VERSION=2.2.11
 
-if %platform% == x86 set PLATFORM_VERSION=32
-if %platform% == X64 set PLATFORM_VERSION=64
-
 MKDIR build
 cd build
 
 :: Configure
-call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CD% -DCMAKE_PREFIX_PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
+call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CD% -DCMAKE_PREFIX_PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
 
 :: Build & Install
 call nmake /F Makefile
diff --git a/tools/appveyor.python.nosetests.bat b/tools/appveyor.python.nosetests.bat
@@ -3,12 +3,9 @@
 set PWD=C:\projects\avtranscoder
 set FFMPEG_VERSION=2.2.11
 
-if %platform% == x86 set PLATFORM_VERSION=32
-if %platform% == X64 set PLATFORM_VERSION=64
-
 :: Get avtranscoder library
 set PYTHONPATH=%PWD%\build\lib\python2.7\site-packages;%PYTHONPATH%
-set PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev\bin;%PWD%\build\lib;%PATH%
+set PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%\bin;%PWD%\build\lib;%PATH%
 
 :: Get avtranscoder profiles
 set AVPROFILES=%PWD%\build\share\avprofiles
diff --git a/tools/appveyor.win.install.deps.bat b/tools/appveyor.win.install.deps.bat
@@ -14,6 +14,6 @@ curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%
 7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared.7z
 
 move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev
-move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev C:\ProgramData\
+move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev C:\ProgramData\ffmpeg-%FFMPEG_VERSION%
 
 @echo off
