X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fmingw%2FREADME;h=26f91dc53f43651c3452e86b0dbb32a5b78afafe;hb=12a3b6fe7d6929d687f228039eeac5b6cddbd84d;hp=b10c0f06b57a022c0bc0c3cd9bdfdee2e2d4cade;hpb=37d3fad3ed5bba7188b99d45e38bef80b11a5a3b;p=sigrok-util.git

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index b10c0f0..26f91dc 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -3,7 +3,7 @@ README
 -------------------------------------------------------------------------------
 
 This is a small script for cross-compiling sigrok and its dependencies
-for Windows/MinGW systems.
+for MinGW-w64/Windows systems.
 
 
 Status
@@ -21,23 +21,30 @@ Requirements
  - cmake
  - git
  - wget
- - unzip
  - p7zip
  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
  - nsis
- - MXE
+ - 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 qt boost
+
+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 qtbase qtimageformats qtsvg boost check
 
 This will take a while.