From: Uwe Hermann <redacted>
Date: Sun, 17 Aug 2014 14:44:18 +0000 (+0200)
Subject: sigrok-cross-mingw: Update MXE and MinGW related docs.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=404eb3564b645e19b52a8e3db7ae9040f2868f6e;p=sigrok-util.git

sigrok-cross-mingw: Update MXE and MinGW related docs.
---

diff --git a/cross-compile/mingw/README b/cross-compile/mingw/README
index 57dc31a..713e387 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
@@ -26,18 +26,32 @@ Requirements
  - 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 check
+
+For now we need to build gcc and winpthreads in two steps. First:
+
+ $ make MXE_TARGETS=i686-w64-mingw32.static gcc winpthreads
+
+In src/gcc.mk change "--enable-threads=win32" to "--enable-threads=posix".
+
+Then build gcc again:
+
+ $ make MXE_TARGETS=i686-w64-mingw32.static gcc
+
+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 \
+   qt boost check
 
 This will take a while.