summaryrefslogtreecommitdiffstats
path: root/plugins/examples/host-toolchain
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2016-07-15 09:03:37 (GMT)
committerTony Theodore <tonyt@logyst.com>2016-07-16 06:53:58 (GMT)
commit109e905f56492c3a67248be800e9e668d0a96c15 (patch)
treeb627adf0c0202c42b769511b4ebce3c620a2a1dc /plugins/examples/host-toolchain
parentbc77cb384ecef7d876acb84c9e198ce01648f492 (diff)
downloadmxe-109e905f56492c3a67248be800e9e668d0a96c15.zip
mxe-109e905f56492c3a67248be800e9e668d0a96c15.tar.gz
mxe-109e905f56492c3a67248be800e9e668d0a96c15.tar.bz2
host-toolchain plugin: improve README
Diffstat (limited to 'plugins/examples/host-toolchain')
-rw-r--r--plugins/examples/host-toolchain/README.md47
1 files changed, 28 insertions, 19 deletions
diff --git a/plugins/examples/host-toolchain/README.md b/plugins/examples/host-toolchain/README.md
index 6b376bf..da27d42 100644
--- a/plugins/examples/host-toolchain/README.md
+++ b/plugins/examples/host-toolchain/README.md
@@ -25,6 +25,29 @@ Comparing files test-gcc-host.exe and TEST-PTHREADS-LIBGOMP.EXE
FC: no differences encountered
```
+#### CMake
+
+```
+make cmake-host MXE_PLUGIN_DIRS=plugins/examples/host-toolchain/
+```
+
+CMake defaults to Visual Studio generators and additional configuration is
+required for [MinGW or MSYS Makefiles][cmake-generators]. MinGW uses `cmd.exe`
+and requires `mingw32-make`, MSYS uses `make` and requires `/bin/sh`. The
+latter is recommended for further investigation since it's closest to the
+normal environment MXE expects. See the following projects for shells and
+terminal emulators:
+
+ - [MSYS2][msys2]
+ - [Git for Windows][git-win] - uses MSYS2
+ - [ConEmu][conemu] - usable terminal
+ - [cmder][cmder] - bundles ConEmu and Git
+
+#### Make
+
+Make is difficult to cross-compile so it is downloaded from the [source
+recommended by the GNU Make team](http://git.savannah.gnu.org/cgit/make.git/tree/README.W32.template).
+
#### Qt5 tools (`qmake.exe`, `rcc.exe`, etc.)
```
@@ -32,7 +55,7 @@ make qt5-host-tools MXE_PLUGIN_DIRS=plugins/examples/host-toolchain/
```
This will build `qtbase`, cross-compile the toolchain and qt tools, and
-download `make` binaries from the source recommended by the GNU Make project.
+download `make` binaries.
On a windows machine, execute
`usr\{target}\qt5\test-qt5-host-tools\test-qt5-host-tools.bat` to build and
@@ -41,24 +64,6 @@ confirm the normal `qt` test with the cross-compiled `qtbase` libraries.
**N.B.** shared `gcc` doesn't work with the test program. To build a shared
test, use the additional option `gcc-host_CONFIGURE_OPTS=--disable-shared`.
-#### CMake
-
-```
-make cmake-host MXE_PLUGIN_DIRS=plugins/examples/host-toolchain/
-```
-
-CMake defaults to Visual Studio generators and additional configuration is
-required for [MinGW or MSYS Makefiles][cmake-generators]. MinGW uses `cmd.exe`
-and requires `mingw32-make`, MSYS uses `make` and requires `/bin/sh`. The
-latter is recommended for further investigation since it's closest to the
-normal environment MXE expects. See the following projects for shells and
-terminal emulators:
-
- - [MSYS2](https://msys2.github.io/)
- - [Git for Windows](https://git-for-windows.github.io/) - uses MSYS2
- - [ConEmu](https://conemu.github.io/) - usable terminal
- - [cmder](http://cmder.net/) - bundles ConEmu and Git
-
Why?
----
@@ -70,3 +75,7 @@ running a Linux VM on Windows).
[cmake-generators]:https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html
+[cmder]:http://cmder.net/
+[conemu]:https://conemu.github.io/
+[git-win]:https://git-for-windows.github.io/
+[msys2]:https://msys2.github.io/