X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2FREADME;h=3d979a8e0cbf4ec5995e31d2a30a66bae5ad3e3e;hp=b10c0f06b57a022c0bc0c3cd9bdfdee2e2d4cade;hb=f8dd8b1eb8bc6da53335a4745d258830ea6367a0;hpb=37d3fad3ed5bba7188b99d45e38bef80b11a5a3b

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index b10c0f0..3d979a8 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,28 +21,45 @@ Requirements
  - cmake
  - git
  - wget
- - unzip
  - p7zip
+ - unzip
  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
  - nsis
- - MXE
+ - MXE (*-w64-*.posix targets; *-pc-* and non-posix 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 \
+   MXE_PLUGIN_DIRS=plugins/examples/qt5-freeze \
+   gcc glib libzip libusb1 libftdi1 hidapi glibmm qtbase qtimageformats \
+   qtsvg qttranslations boost check gendef libieee1284 \
+   qtbase_CONFIGURE_OPTS='-no-sql-mysql'
 
 This will take a while.
 
+You can also use "MXE_TARGETS=x86_64-w64-mingw32.static.posix" to build
+64-bit installers instead.
+
 See http://mxe.cc for details on MXE.
 
+Note: We're "freezing" the Qt5 version to Qt 5.7.x, since that's the last
+version that supports Windows XP (which we currently still want to support).
+
 
 Building
 --------
@@ -55,7 +72,10 @@ Per default it expects MXE in:
 
 Per default it will install the cross-compiled packages in:
 
- $HOME/sr_mingw
+ $HOME/sr_mingw_release_32
+
+This depends on whether you're doing a 64-bit or 32-bit build, and whether
+you enabled debug builds or not.
 
 Please edit the script if you want to change any settings.