X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmingw%2FREADME;h=43d05f282c2b721d7e0c0bf2f3d2bfde31e426fb;hb=53f16758e33f2c9e922258b3259ce5a5a4631447;hp=26f91dc53f43651c3452e86b0dbb32a5b78afafe;hpb=12a3b6fe7d6929d687f228039eeac5b6cddbd84d;p=sigrok-util.git

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index 26f91dc..43d05f2 100644
--- a/cross-compile/mingw/README
+++ b/cross-compile/mingw/README
@@ -22,10 +22,11 @@ Requirements
  - git
  - wget
  - p7zip
+ - unzip
  - pkg-config (>= 0.22)
  - sdcc (needed for building the fx2lafw firmware)
  - nsis
- - MXE (*-w64-* targets, the *-pc-* targets are not supported)
+ - MXE (*-w64-*.posix targets; *-pc-* and non-posix targets are not supported)
 
 
 MXE setup
@@ -40,16 +41,26 @@ First, get the MXE cross-compile environment for MinGW-w64/Windows:
 Apply some fixes that are currently required for a proper build:
 
  $ patch -p1 < mxe_fixes.patch
+ $ patch -p1 < libusb1_upgrade.patch
 
 Build all required packages:
 
- $ make MXE_TARGETS=i686-w64-mingw32.static.posix gcc glib libzip libusb1 \
-   libftdi1 glibmm qtbase qtimageformats qtsvg boost check
+ $ 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
 --------
@@ -62,7 +73,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.