Merge official

This commit is contained in:
Michael Rose 2013-08-15 12:12:11 +02:00
commit 56bcbb8fc4
2 changed files with 7 additions and 6 deletions

View File

@ -23,7 +23,7 @@ On Fedora:
```bash
yum groupinstall "Development Tools"
yum install libtool autoconf automake libconfig-devel ncurses-devel cmake check
yum install libtool autoconf automake libconfig-devel ncurses-devel cmake check check-devel
```
Note that `libconfig-dev` should be >= 1.4.
@ -61,8 +61,8 @@ mkdir build && cd build
cmake ..
```
Advance cmake options:
- `-DSHARED_TOXCORE=ON` (default `OFF`) Build Core as a shared library.
- `-DUSE_NACL=ON` (default `OFF`) Use NaCl library instead of libsodium.
- `-DSHARED_TOXCORE=ON` (default `OFF`) <EFBFBD> Build Core as a shared library.
- `-DUSE_NACL=ON` (default `OFF`) <EFBFBD> Use NaCl library instead of libsodium.
Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only.
@ -150,8 +150,8 @@ mkdir build && cd build
cmake -G "MinGW Makefiles" ..
```
Advance cmake options:
- `-DSHARED_TOXCORE=ON` (default OFF) Build Core as a shared library.
- `-DSHARED_LIBSODIUM=ON` (default OFF) Link libsodium as a shared library.
- `-DSHARED_TOXCORE=ON` (default OFF) <EFBFBD> Build Core as a shared library.
- `-DSHARED_LIBSODIUM=ON` (default OFF) <EFBFBD> Link libsodium as a shared library.
Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only.

View File

@ -3,4 +3,5 @@
192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
192.210.149.121 33445 F404ABAA1C99A9D37D61AB54898F56793E1DEF8BD46B1038B9D822E8460FAB67
81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269
198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
95.47.140.214 33445 F4BF7C5A9D0EF4CB684090C38DE937FAE1612021F21FEA4DCBFAC6AAFEF58E68