diff options
| author | Casimir666 <casimir666@users.sourceforge.net> | 2009-07-22 18:26:00 +0400 |
|---|---|---|
| committer | Casimir666 <casimir666@users.sourceforge.net> | 2009-07-22 18:26:00 +0400 |
| commit | 03f8f3f08345070a65f0cb04b60c1784ef9234ca (patch) | |
| tree | 36ece0ec8f90427160777afb1f50c6ae3b6c7a44 /src/filters/transform/mpcvideodec/ffmpeg | |
| parent | 0f3be82ed5c64b31d64efe69b21e332681acbf6f (diff) | |
Changed : GCC compilation script, revert to MINGW32 and MINGW64 environment variables (read compilation.txt)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1178 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/mpcvideodec/ffmpeg')
| -rw-r--r-- | src/filters/transform/mpcvideodec/ffmpeg/gccbuild.bat | 10 | ||||
| -rw-r--r-- | src/filters/transform/mpcvideodec/ffmpeg/gccbuild64.bat | 15 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/gccbuild.bat b/src/filters/transform/mpcvideodec/ffmpeg/gccbuild.bat index a2df0a55a..0f71dea9a 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/gccbuild.bat +++ b/src/filters/transform/mpcvideodec/ffmpeg/gccbuild.bat @@ -1,9 +1,15 @@ @echo off
-if NOT "x%CC%" == "x" goto VarOk
+if NOT "x%MINGW32%" == "x" goto Var1Ok
+echo "ERROR : please define MINGW32 (and/or MSYS) environment variable(s)"
+exit 1005
+
+:Var1Ok
+if NOT "x%CC%" == "x" goto Var2Ok
echo "ERROR : please define CC environment variable"
exit 1005
-:VarOk
+:Var2Ok
+set PATH=%MINGW32%;%YASM%;%PATH%
IF "%1%"=="rebuild" goto DoClean
IF "%1%"=="clean" goto OnlyClean
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/gccbuild64.bat b/src/filters/transform/mpcvideodec/ffmpeg/gccbuild64.bat index e17cadf27..44bbd0d5f 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/gccbuild64.bat +++ b/src/filters/transform/mpcvideodec/ffmpeg/gccbuild64.bat @@ -1,9 +1,20 @@ @echo off
-if NOT "x%CC%" == "x" goto VarOk
+if NOT "x%MINGW64%" == "x" goto Var1Ok
+echo "ERROR : please define MINGW64 (and/or MSYS) environment variable(s)"
+exit 1005
+
+:Var1Ok
+if NOT "x%CC%" == "x" goto Var2Ok
echo "ERROR : please define CC environment variable"
exit 1005
-:VarOk
+:Var2Ok
+set PATH=%MINGW64%;%YASM%;%PATH%
+IF EXIST "%MINGW32%\mingw32-make.exe" copy /y "%MINGW32%\mingw32-make.exe" "%MINGW32%\make.exe" >nul
+IF EXIST "%MINGW64%\x86_64-pc-mingw32\ar.exe" copy /y "%MINGW64%\x86_64-pc-mingw32\ar.exe" "%MINGW64%\x86_64-pc-mingw32-ar.exe" >nul
+IF EXIST "%MINGW64%\x86_64-pc-mingw32-make.exe" copy /y "%MINGW64%\x86_64-pc-mingw32-make.exe" "%MINGW64%\make.exe" >nul
+IF EXIST "%MINGW64%\x86_64-pc-mingw32-gcc.exe" copy /y "%MINGW64%\x86_64-pc-mingw32-gcc.exe" "%MINGW64%\cc.exe" >nul
+IF EXIST "%MINGW64%\x86_64-pc-mingw32-gcc.exe" copy /y "%MINGW64%\x86_64-pc-mingw32-gcc.exe" "%MINGW64%\x86_64-pc-mingw32-cc.exe" >nul
IF "%1%"=="rebuild" goto DoClean
IF "%1%"=="clean" goto OnlyClean
|