Merge pull request #3266 from wsoltys/mingwupdate

[mingw] updated w32api and mingwrt to 4.0.1 and some cleanup
xbmc · Oct 1, 2013 · d6bba80 · d6bba80
2 parents bbf6dcd + 098c1fc
commit d6bba80
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 50 deletions.
diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat
@@ -46,13 +46,6 @@ SET FSTAB=%FSTAB:\=/%
 SET FSTAB=%FSTAB:"=%
 ECHO %FSTAB% /xbmc>>"%MSYS_INSTALL_PATH%\etc\fstab"
 
-rem patch mingw headers to compile ffmpeg
-xcopy mingw_support\postinstall\* "%MSYS_INSTALL_PATH%\postinstall\" /E /Q /I /Y
-cd "%MSYS_INSTALL_PATH%\postinstall"
-CALL pi_patches.bat
-
-cd %CUR_PATH%
-
 rem insert call to vcvars32.bat in msys.bat
 SET NET90VARS="%VS90COMNTOOLS%..\..\VC\bin\vcvars32.bat"
 SET NET100VARS="%VS100COMNTOOLS%..\..\VC\bin\vcvars32.bat"

diff --git a/project/BuildDependencies/mingw_support/postinstall/patches/nomt.diff b/project/BuildDependencies/mingw_support/postinstall/patches/nomt.diff
diff --git a/project/BuildDependencies/mingw_support/postinstall/patches/strcasecmp.diff b/project/BuildDependencies/mingw_support/postinstall/patches/strcasecmp.diff
diff --git a/project/BuildDependencies/mingw_support/postinstall/patches/tempnam.diff b/project/BuildDependencies/mingw_support/postinstall/patches/tempnam.diff
diff --git a/project/BuildDependencies/mingw_support/postinstall/pi_patches.bat b/project/BuildDependencies/mingw_support/postinstall/pi_patches.bat
diff --git a/project/BuildDependencies/mingw_support/postinstall/pi_patches.sh b/project/BuildDependencies/mingw_support/postinstall/pi_patches.sh
diff --git a/project/BuildDependencies/scripts/get_mingw_env.txt b/project/BuildDependencies/scripts/get_mingw_env.txt
@@ -1,7 +1,7 @@
 ; filename                                  mirror                                                      source of the file
-mingwrt-3.20-mingw32-dev.tar.gz             http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-3.20/
-mingwrt-3.20-mingw32-dll.tar.gz             http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-3.20/
-w32api-3.17-2-mingw32-dev.tar.lzma          http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-3.17/
+mingwrt-4.0.1-1-mingw32-dev.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/Base/
+mingwrt-4.0.1-1-mingw32-dll.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/Base/
+w32api-4.0.1-1-mingw32-dev.tar.lzma         http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://sourceforge.net/projects/mingw/files/MinGW/Base/
 gcc-core-4.6.2-1-mingw32-bin.tar.lzma       http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.6.2-1/
 gcc-c++-4.6.2-1-mingw32-bin.tar.lzma        http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.6.2-1/
 libstdc++-4.6.2-1-mingw32-dll-6.tar.lzma    http://mirrors.xbmc.org/build-deps/win32/mingw-msys/        http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-4.6.2-1/

diff --git a/project/Win32BuildSetup/buildmingwlibs.sh b/project/Win32BuildSetup/buildmingwlibs.sh
@@ -9,6 +9,9 @@ NOPROMPT=0
 MAKECLEAN=""
 MAKEFLAGS=""
 
+export _WIN32_WINNT=0x0600
+export NTDDI_VERSION=0x06000000
+
 function throwerror ()
 {
   $TOUCH $ERRORFILE