X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2FREADME;h=27a4aab4f6aa0a42215321b6764bd48876a4891b;hp=a9984dcef5850dfeea4fac3caa3d7e44a0c3c95a;hb=fe8f66a93d7818d292cbd810fe79e5431a2a0aa6;hpb=d140e8b4bbe0f7a40ad6e964441c60499d0d87a0

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index a9984dc..27a4aab 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -21,7 +21,6 @@ Requirements
  - cmake
  - git
  - wget
- - unzip
  - p7zip
  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
@@ -38,20 +37,14 @@ First, get the MXE cross-compile environment for MinGW-w64/Windows:
  $ git clone https://github.com/mxe/mxe.git mxe-git
  $ cd mxe-git
 
-For now we need to build gcc and winpthreads in two steps. First:
+Apply some fixes that are currently required for a proper build:
 
- $ make MXE_TARGETS=i686-w64-mingw32.static gcc winpthreads
+ $ patch -p1 < mxe_fixes.patch
 
-In src/gcc.mk change "--enable-threads=win32" to "--enable-threads=posix".
+Build all required packages:
 
-Then build gcc again:
-
- $ make MXE_TARGETS=i686-w64-mingw32.static gcc
-
-We now have a system that supports C++11 std::thread. Now build the rest:
-
- $ make MXE_TARGETS=i686-w64-mingw32.static glib libzip libusb1 libftdi \
-   glibmm qtbase qtsvg boost check
+ $ make MXE_TARGETS=i686-w64-mingw32.static.posix gcc glib libzip libusb1 \
+   libftdi1 glibmm qt5 boost check
 
 This will take a while.