[WIN32] fixed: use gnu make 3.82 to compile newer ffmpeg

diff --git a/project/BuildDependencies/scripts/get_mingw_env.bat b/project/BuildDependencies/scripts/get_mingw_env.bat
index 1cf948c..c81b71b 100644 (file)
--- a/project/BuildDependencies/scripts/get_mingw_env.bat
+++ b/project/BuildDependencies/scripts/get_mingw_env.bat
@@ -23,6 +23,7 @@ xcopy mingw32\* "%MINGW_INSTALL_PATH%\mingw32" /E /Q /I /Y
 copy yasm-1.2.0-win32.exe "%MINGW_INSTALL_PATH%\bin\yasm.exe" /Y
 copy xasm.exe "%MINGW_INSTALL_PATH%\bin\xasm.exe" /Y
 copy mads.exe "%MINGW_INSTALL_PATH%\bin\mads.exe" /Y
+copy "%MINGW_INSTALL_PATH%\bin\mingw32-make.exe" "%MINGW_INSTALL_PATH%\bin\make.exe" /Y
 rem xcopy curl-7.21.0-devel-mingw32\include\curl "%CUR_PATH%\include\curl" /E /Q /I /Y
 rem copy curl-7.21.0-devel-mingw32\bin\*.dll "%XBMC_PATH%\system\" /Y
 

diff --git a/project/BuildDependencies/scripts/get_mingw_env.txt b/project/BuildDependencies/scripts/get_mingw_env.txt
index 7a52d8b..a76987a 100644 (file)
--- a/project/BuildDependencies/scripts/get_mingw_env.txt
+++ b/project/BuildDependencies/scripts/get_mingw_env.txt
@@ -24,4 +24,5 @@ gnutls-dev_2.4.2-1_win32.zip                http://mirrors.xbmc.org/build-deps/w
 gettext-0.17-1-mingw32-dev.tar.lzma         http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/gettext/gettext-0.17-1/gettext-0.17-1-mingw32-dev.tar.lzma
 libintl-0.17-1-mingw32-dll-8.tar.lzma       http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/gettext/gettext-0.17-1/
 libiconv-1.13.1-1-mingw32-dll-2.tar.lzma    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/libiconv/libiconv-1.13.1-1/
-libiconv-1.13.1-1-mingw32-dev.tar.lzma      http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/libiconv/libiconv-1.13.1-1/
\ No newline at end of file
+libiconv-1.13.1-1-mingw32-dev.tar.lzma      http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/libiconv/libiconv-1.13.1-1/
+make-3.82-5-mingw32-bin.tar.lzma            http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/Extension/make/make-3.82-mingw32/
\ No newline at end of file

diff --git a/project/BuildDependencies/scripts/get_msys_env.txt b/project/BuildDependencies/scripts/get_msys_env.txt
index 1be8257..93e651d 100644 (file)
--- a/project/BuildDependencies/scripts/get_msys_env.txt
+++ b/project/BuildDependencies/scripts/get_msys_env.txt
@@ -9,7 +9,7 @@ libiconv-1.13.1-2-msys-1.0.13-dll-2.tar.lzma            http://mirrors.xbmc.org/
 coreutils-5.97-3-msys-1.0.13-bin.tar.lzma               http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/coreutils/coreutils-5.97-3/
 bash-3.1.17-4-msys-1.0.16-bin.tar.lzma                  http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/bash/bash-3.1.17-4/
 rxvt-2.7.2-3-msys-1.0.14-bin.tar.lzma                   http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/rxvt/rxvt-2.7.2-3/
-make-3.81-3-msys-1.0.13-bin.tar.lzma                    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/make/make-3.81-3/
+;make-3.81-3-msys-1.0.13-bin.tar.lzma                    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/make/make-3.81-3/
 sed-4.2.1-2-msys-1.0.13-bin.tar.lzma                    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/sed/sed-4.2.1-2/
 grep-2.5.4-2-msys-1.0.13-bin.tar.lzma                   http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/grep/grep-2.5.4-2/
 diffutils-2.8.7.20071206cvs-3-msys-1.0.13-bin.tar.lzma  http://mirrors.xbmc.org/build-deps/win32/mingw-msys/      http://downloads.sourceforge.net/project/mingw/MSYS/BaseSystem/diffutils/diffutils-2.8.7.20071206cvs-3/