Merge branch 'master' into cmake

This commit is contained in:
HengiFettlich 2020-05-08 08:11:17 +02:00
commit 88c128fbd2
1 changed files with 2 additions and 4 deletions

View File

@ -53,14 +53,12 @@ Run `make` to build (defaults to `VERSION=us`)
```
make VERSION=jp -j6 # build (J) version with 6 jobs
make VERSION=us WINDOWS-BUILD=1 # builds a (U) Windows executable
make VERSION=us WINDOWS_BUILD=1 # builds a (U) Windows executable
```
### On Windows
Install WSL with a distro of your choice (Ubuntu 18.04 recommended) following [the official guide](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
Then follow the instructions of the Linux section above. It's also possible to build using [MinGW](http://www.mingw.org/), but it tends to be considerably more difficult.
A full guide is to be written. You can use [mxe](https://mxe.cc/) and MinGW.
### For the web