| OLD | NEW |
| 1 libadblockplus | 1 libadblockplus |
| 2 ============== | 2 ============== |
| 3 | 3 |
| 4 A C++ library offering the core functionality of Adblock Plus. | 4 A C++ library offering the core functionality of Adblock Plus. |
| 5 | 5 |
| 6 Getting/updating the dependencies | 6 Getting/updating the dependencies |
| 7 --------------------------------- | 7 --------------------------------- |
| 8 | 8 |
| 9 libadblockplus has dependencies that aren't part of this repository. They are | 9 libadblockplus has dependencies that aren't part of this repository. They are |
| 10 retrieved and updated during the build process, but you can also manually update | 10 retrieved and updated during the build process, but you can also manually update |
| 11 them by running the following: | 11 them by running the following: |
| 12 | 12 |
| 13 ./ensure_dependencies.py | 13 ./ensure_dependencies.py |
| 14 | 14 |
| 15 Building | 15 Building |
| 16 -------- | 16 -------- |
| 17 | 17 |
| 18 ### Supported target platforms and prerequisites | 18 ### Supported target platforms and prerequisites |
| 19 | 19 |
| 20 You need a C++11 compatible compiler to build libadblockplus. | 20 You need a C++14 compatible compiler to build libadblockplus. |
| 21 | 21 |
| 22 Win32: | 22 Win32: |
| 23 * At least v140 Visual C++ toolset (available in Microsoft Visual Studio 2015). | 23 * At least v141 Visual C++ toolset (available in Microsoft Visual Studio 2017). |
| 24 | 24 |
| 25 Linux: | 25 Linux: |
| 26 * g++ 5.2 | 26 * g++ 5.2 |
| 27 | 27 |
| 28 Mac: | 28 Mac: |
| 29 * clang 3.6 for OS X/macOS (Xcode should be installed and its developer tools sh
ould be "selected"). | 29 * clang 3.6 for OS X/macOS (Xcode should be installed and its developer tools sh
ould be "selected"). |
| 30 | 30 |
| 31 Android: | 31 Android: |
| 32 * The host system should be Linux or OS X | 32 * The host system should be Linux or OS X |
| 33 * android-ndk-r12b Here are the links for downloading | 33 * android-ndk-r16b Here are the links for downloading |
| 34 [OS X](https://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64
.zip), | 34 [OS X](https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64
.zip), |
| 35 [Linux 64](https://dl.google.com/android/repository/android-ndk-r12b-linux-x86
_64.zip). | 35 [Linux 64](https://dl.google.com/android/repository/android-ndk-r16b-linux-x86
_64.zip). |
| 36 * g++ multilib | 36 * g++ multilib |
| 37 | 37 |
| 38 If you have a compilation issue with another compiler please [create an issue](h
ttps://issues.adblockplus.org/). | 38 If you have a compilation issue with another compiler please [create an issue](h
ttps://issues.adblockplus.org/). |
| 39 | 39 |
| 40 You also need Python 2.7 and ensure that `python.exe` is in your `PATH`. | 40 You also need Python 2.7 and ensure that `python.exe` is in your `PATH`. |
| 41 | 41 |
| 42 ### Unix | 42 ### Unix |
| 43 | 43 |
| 44 Using Make: | 44 Using Make: |
| 45 | 45 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 68 | 68 |
| 69 * Execute `createsolution.bat` to generate project files, this will create | 69 * Execute `createsolution.bat` to generate project files, this will create |
| 70 `build\ia32\libadblockplus.sln` (solution for the 32 bit build) and | 70 `build\ia32\libadblockplus.sln` (solution for the 32 bit build) and |
| 71 `build\x64\libadblockplus.sln` (solution for the 64 bit build). Unfortunately, | 71 `build\x64\libadblockplus.sln` (solution for the 64 bit build). Unfortunately, |
| 72 V8 doesn't support creating both from the same project files. | 72 V8 doesn't support creating both from the same project files. |
| 73 * Open `build\ia32\libadblockplus.sln` or `build\x64\libadblockplus.sln` in | 73 * Open `build\ia32\libadblockplus.sln` or `build\x64\libadblockplus.sln` in |
| 74 Visual Studio and build the solution there. Alternatively you can use the | 74 Visual Studio and build the solution there. Alternatively you can use the |
| 75 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\libadblockplus.sln` | 75 `msbuild` command line tool, e.g. run `msbuild /m build\ia32\libadblockplus.sln` |
| 76 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. | 76 from the Visual Studio Developer Command Prompt to create a 32 bit debug build. |
| 77 | 77 |
| 78 Tested on Microsoft Visual Studio 2015 Community Edition. | 78 Tested on Microsoft Visual Studio 2017 Community Edition. |
| 79 | 79 |
| 80 ### Building for Android | 80 ### Building for Android |
| 81 | 81 |
| 82 First set ANDROID_NDK_ROOT environment variable to your Android NDK directory. | 82 First set ANDROID_NDK_ROOT environment variable to your Android NDK directory. |
| 83 | 83 |
| 84 To build for *x86* arch run: | 84 To build for *x86* arch run: |
| 85 | 85 |
| 86 make android_x86 | 86 make android_x86 |
| 87 | 87 |
| 88 To build for *arm* or *arm64* arch run: | 88 To build for *arm* or *arm64* arch run: |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 Linting | 274 Linting |
| 275 ------- | 275 ------- |
| 276 | 276 |
| 277 You can lint the code using [ESLint](http://eslint.org). | 277 You can lint the code using [ESLint](http://eslint.org). |
| 278 | 278 |
| 279 npm run eslint | 279 npm run eslint |
| 280 | 280 |
| 281 In order to set up ESLint and | 281 In order to set up ESLint and |
| 282 [configuration eslint-config-eyeo](https://hg.adblockplus.org/codingtools/file/t
ip/eslint-config-eyeo) you need [Node.js 7 or higher](https://nodejs.org/) and o
nce it is installed please run `npm install` in the repository directory. | 282 [configuration eslint-config-eyeo](https://hg.adblockplus.org/codingtools/file/t
ip/eslint-config-eyeo) you need [Node.js 7 or higher](https://nodejs.org/) and o
nce it is installed please run `npm install` in the repository directory. |
| 283 | 283 |
| OLD | NEW |