diff options
| -rwxr-xr-x | lib/ffmpeg/build_xbmc_win32.sh | 2 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/get_mingw_env.bat | 2 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/get_msys_env.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/ffmpeg/build_xbmc_win32.sh b/lib/ffmpeg/build_xbmc_win32.sh index 0209958be3..887d74ad5d 100755 --- a/lib/ffmpeg/build_xbmc_win32.sh +++ b/lib/ffmpeg/build_xbmc_win32.sh @@ -51,7 +51,7 @@ OPTIONS=" ./configure --extra-cflags="-fno-common -Iinclude-xbmc-win32/dxva2 -DNDEBUG" --extra-ldflags="-L/xbmc/system/players/dvdplayer" ${OPTIONS} && -make $MAKEFLAGS && +mingw32-make $MAKEFLAGS && cp lib*/*.dll .libs/ && cp .libs/avcodec-54.dll /xbmc/system/players/dvdplayer/ && cp .libs/avformat-54.dll /xbmc/system/players/dvdplayer/ && 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/ |