aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorwsoltys <wiso@no.way>2013-04-13 17:18:16 +0200
committerwsoltys <wiso@no.way>2013-04-13 17:20:43 +0200
commitd721bfca218cd411ff9b55a83ee132facf6dfe41 (patch)
treeffc217352b242533f7919f74a0e8542fcf6ea116 /project
parentd2e4acfd41735cf68d23e7777c50eade37b3abd9 (diff)
[WIN32] fixed: hopefully this time. use the new mingw make only for ffmpeg and use the old make for the rest.
Diffstat (limited to 'project')
-rw-r--r--project/BuildDependencies/scripts/get_mingw_env.bat2
-rw-r--r--project/BuildDependencies/scripts/get_msys_env.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/project/BuildDependencies/scripts/get_mingw_env.bat b/project/BuildDependencies/scripts/get_mingw_env.bat
index c81b71b69a..b071f56ff9 100644
--- a/project/BuildDependencies/scripts/get_mingw_env.bat
+++ b/project/BuildDependencies/scripts/get_mingw_env.bat
@@ -23,7 +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 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_msys_env.txt b/project/BuildDependencies/scripts/get_msys_env.txt
index 93e651d91e..1be8257ac2 100644
--- 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/