diff options
| author | Michael Rose <michael_rose@gmx.de> | 2013-08-15 12:12:11 +0200 |
|---|---|---|
| committer | Michael Rose <michael_rose@gmx.de> | 2013-08-15 12:12:11 +0200 |
| commit | 56bcbb8fc4d80260621414ced9784d701af57435 (patch) | |
| tree | b6d9410d185b5ec4993c1bc6969198b50825a65d | |
| parent | 76bfefff6f312024595fba8fd8115bbf93084946 (diff) | |
| parent | 70b633d81634fb7369065cb902deee87ac84b7ca (diff) | |
Merge official
| -rw-r--r-- | INSTALL.md | 10 | ||||
| -rw-r--r-- | other/DHTservers | 3 |
2 files changed, 7 insertions, 6 deletions
| @@ -23,7 +23,7 @@ On Fedora: | |||
| 23 | 23 | ||
| 24 | ```bash | 24 | ```bash |
| 25 | yum groupinstall "Development Tools" | 25 | yum groupinstall "Development Tools" |
| 26 | yum install libtool autoconf automake libconfig-devel ncurses-devel cmake check | 26 | yum install libtool autoconf automake libconfig-devel ncurses-devel cmake check check-devel |
| 27 | ``` | 27 | ``` |
| 28 | 28 | ||
| 29 | Note that `libconfig-dev` should be >= 1.4. | 29 | Note that `libconfig-dev` should be >= 1.4. |
| @@ -61,8 +61,8 @@ mkdir build && cd build | |||
| 61 | cmake .. | 61 | cmake .. |
| 62 | ``` | 62 | ``` |
| 63 | Advance cmake options: | 63 | Advance cmake options: |
| 64 | - `-DSHARED_TOXCORE=ON` (default `OFF`) — Build Core as a shared library. | 64 | - `-DSHARED_TOXCORE=ON` (default `OFF`) � Build Core as a shared library. |
| 65 | - `-DUSE_NACL=ON` (default `OFF`) — Use NaCl library instead of libsodium. | 65 | - `-DUSE_NACL=ON` (default `OFF`) � Use NaCl library instead of libsodium. |
| 66 | 66 | ||
| 67 | Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only. | 67 | Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only. |
| 68 | 68 | ||
| @@ -150,8 +150,8 @@ mkdir build && cd build | |||
| 150 | cmake -G "MinGW Makefiles" .. | 150 | cmake -G "MinGW Makefiles" .. |
| 151 | ``` | 151 | ``` |
| 152 | Advance cmake options: | 152 | Advance cmake options: |
| 153 | - `-DSHARED_TOXCORE=ON` (default OFF) — Build Core as a shared library. | 153 | - `-DSHARED_TOXCORE=ON` (default OFF) � Build Core as a shared library. |
| 154 | - `-DSHARED_LIBSODIUM=ON` (default OFF) — Link libsodium as a shared library. | 154 | - `-DSHARED_LIBSODIUM=ON` (default OFF) � Link libsodium as a shared library. |
| 155 | 155 | ||
| 156 | Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only. | 156 | Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only. |
| 157 | 157 | ||
diff --git a/other/DHTservers b/other/DHTservers index 560c29b5..6efba882 100644 --- a/other/DHTservers +++ b/other/DHTservers | |||
| @@ -3,4 +3,5 @@ | |||
| 3 | 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143 | 3 | 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143 |
| 4 | 192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67 | 4 | 192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67 |
| 5 | 81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269 | 5 | 81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269 |
| 6 | 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854 \ No newline at end of file | 6 | 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854 |
| 7 | 95.47.140.214 33445 F4BF7C5A9D0EF4CB684090C38DE937FAE1612021F21FEA4DCBFAC6AAFEF58E68 | ||