| Index: README.md |
| =================================================================== |
| --- a/README.md |
| +++ b/README.md |
| @@ -19,16 +19,18 @@ |
| You need a C++11 compatible compiler to build libadblockplus. |
| Win32: |
| * At least v140 Visual C++ toolset (available in Microsoft Visual Studio 2015). |
| Linux: |
| * g++ 5.2 |
| +If building using meson: |
| +* meson 0.40.0 |
| Mac: |
| * clang 3.6 for OS X/macOS (Xcode should be installed and its developer tools should be "selected"). |
| Android: |
| * The host system should be Linux or OS X |
| * android-ndk-r12b Here are the links for downloading |
| [OS X](https://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64.zip), |
| @@ -36,26 +38,40 @@ |
| * g++ multilib |
| If you have a compilation issue with another compiler please [create an issue](https://issues.adblockplus.org/). |
| You also need Python 2.7 and ensure that `python.exe` is in your `PATH`. |
| ### Unix |
| -Using Make: |
| +You can use either `meson` or `make`. |
| + |
| +#### Using Meson: |
| + |
| + meson build |
| + |
| +Then |
| + |
| + ninja -C build |
| + |
| +To build and run the tests |
| + |
| + ninja -C build test |
| + |
| +#### Using Make: |
| make |
| The default target architecture is the architecture of a host. In order to build for a different architecture pass `ARCH` to `make`, e.g. run: |
| make ARCH=ia32 |
| supported values are `ia32` and `x64`. |
| - |
| + |
| To build and run the tests: |
| make test |
| Likewise, use the following with `ARCH`: |
| make test ARCH=ia32 |