| 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 libadblockplus is still work in progress, at an early stage. | 6 libadblockplus is still work in progress, at an early stage. |
| 7 | 7 |
| 8 Building | 8 Building |
| 9 -------- | 9 -------- |
| 10 | 10 |
| 11 ### Unix | 11 ### Unix |
| 12 | 12 |
| 13 All you need is Python 2.6 and Make: | 13 All you need is Python 2.6 and Make: |
| 14 | 14 |
| 15 make | 15 make |
| 16 | 16 |
| 17 The default target architecture is x64. On a 32 bit system, run: | 17 The default target architecture is x64. On a 32 bit system, run: |
| 18 | 18 |
| 19 make ARCH=ia32 | 19 make ARCH=ia32 |
| 20 | 20 |
| 21 To build and run the tests: | 21 To build and run the tests: |
| 22 | 22 |
| 23 make test | 23 make test |
| 24 | 24 |
| 25 Likewise, use the following on a 32 bit system: | 25 Likewise, use the following on a 32 bit system: |
| 26 | 26 |
| 27 make test ARCH=ia32 | 27 make test ARCH=ia32 |
| 28 | 28 |
| 29 This will build a version of libdabblockplus that uses stubs instead |
| 30 of the actual Adblock Plus code, because the latter does not work |
| 31 yet. To build it anyway: |
| 32 |
| 33 make test CXXFLAGS="-DFILTER_ENGINE_STUBS=0" |
| 34 |
| 29 ### Windows | 35 ### Windows |
| 30 | 36 |
| 31 You need Microsoft Visual C++ (Express is sufficient) 2010 or later | 37 You need Microsoft Visual C++ (Express is sufficient) 2010 or later |
| 32 and Python 2.6. | 38 and Python 2.6. |
| 33 | 39 |
| 34 1. Execute *buildmsvs.bat* | 40 1. Execute *buildmsvs.bat* |
| 35 2. Open the solution *MSVS\libadblockplus.sln* | 41 2. Open the solution *MSVS\libadblockplus.sln* |
| 36 3. Unload the following projects: | 42 3. Unload the following projects: |
| 37 - tests | 43 - tests |
| 38 - third\_party/googletest | 44 - third\_party/googletest |
| (...skipping 18 matching lines...) Expand all Loading... |
| 57 | 63 |
| 58 ### Unix | 64 ### Unix |
| 59 | 65 |
| 60 The shell is automatically built by `make`, you can run it as follows: | 66 The shell is automatically built by `make`, you can run it as follows: |
| 61 | 67 |
| 62 build/out/abpshell | 68 build/out/abpshell |
| 63 | 69 |
| 64 ### Windows | 70 ### Windows |
| 65 | 71 |
| 66 Just run the project *abpshell*. | 72 Just run the project *abpshell*. |
| OLD | NEW |