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

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index ef21a17..27a4aab 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -3,13 +3,13 @@ README
 -------------------------------------------------------------------------------
 
 This is a small script for cross-compiling sigrok and its dependencies
-for Windows/MinGW systems.
+for MinGW-w64/Windows systems.
 
 
 Status
 ------
 
-Work in progress. This does NOT yet fully work.
+Working.
 
 
 Requirements
@@ -18,20 +18,33 @@ Requirements
  - bash
  - gcc
  - make
+ - cmake
  - git
+ - wget
+ - p7zip
  - pkg-config (>= 0.22)
- - MXE
+ - sdcc (needed for building the fx2lafw firmware)
+ - nsis
+ - MXE (*-w64-* targets, the *-pc-* targets are not supported)
 
 
 MXE setup
 ---------
 
-First, setup the MXE cross-compile environment for MinGW/Windows:
+First, get the MXE cross-compile environment for MinGW-w64/Windows:
 
  $ cd $HOME
  $ git clone https://github.com/mxe/mxe.git mxe-git
  $ cd mxe-git
- $ make gcc glib libzip libusb1 libftdi gtk2 qt boost nsis
+
+Apply some fixes that are currently required for a proper build:
+
+ $ patch -p1 < mxe_fixes.patch
+
+Build all required packages:
+
+ $ make MXE_TARGETS=i686-w64-mingw32.static.posix gcc glib libzip libusb1 \
+   libftdi1 glibmm qt5 boost check
 
 This will take a while.