X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2FREADME;h=248af546f939a81855dda33142d834eecf2979c2;hp=9aed6c4cb46cf3eefeeada23cd94cb37ac26df4f;hb=4e8697df7f33d4014cef88214b02d4a56addcde9;hpb=a1c891a9f2500c678603900447015083943f96ec

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index 9aed6c4..248af54 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,6 +37,10 @@ First, get the MXE cross-compile environment for MinGW-w64/Windows:
  $ git clone https://github.com/mxe/mxe.git mxe-git
  $ cd mxe-git
 
+Apply some fixes that are currently required for a proper build:
+
+ $ patch -p1 < mxe_fixes.patch
+
 For now we need to build gcc and winpthreads in two steps. First:
 
  $ make MXE_TARGETS=i686-w64-mingw32.static gcc winpthreads
@@ -50,8 +53,8 @@ Then build gcc again:
 
 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 \
-   qtbase boost check
+ $ make MXE_TARGETS=i686-w64-mingw32.static glib libzip libusb1 libftdi1 \
+   glibmm qt boost check
 
 This will take a while.