Merge remote-tracking branch 'zetok/docs-install'

This commit is contained in:
iphydf 2016-10-26 13:07:26 +01:00
commit 09c8575a7d
No known key found for this signature in database
GPG Key ID: 3855DBA2D74403C9

View File

@ -121,8 +121,8 @@ sudo ldconfig
Then clone this repo, run `cmake`, and install `toxcore` system-wide: Then clone this repo, run `cmake`, and install `toxcore` system-wide:
```bash ```bash
git clone https://github.com/TokTok/toxcore.git git clone https://github.com/TokTok/c-toxcore.git c-toxcore
cd toxcore cd c-toxcore
cmake . cmake .
make make
sudo make install sudo make install
@ -152,8 +152,8 @@ brew install libtool automake autoconf libsodium check
``` ```
Then clone this repo and generate makefile: Then clone this repo and generate makefile:
```bash ```bash
git clone https://github.com/TokTok/toxcore.git git clone https://github.com/TokTok/c-toxcore.git c-toxcore
cd toxcore cd c-toxcore
autoreconf -i autoreconf -i
./configure ./configure
make make
@ -232,7 +232,7 @@ sudo make install
Compiling and installing Tox Core Compiling and installing Tox Core
```bash ```bash
cd toxcore cd c-toxcore
autoreconf -i autoreconf -i
./configure (OS X 10.5 specific) ./configure (OS X 10.5 specific)
./configure CC="gcc -arch ppc -arch i386" CXX="g++ -arch ppc -arch i386" CPP="gcc -E" CXXCPP="g++ -E" ./configure CC="gcc -arch ppc -arch i386" CXX="g++ -arch ppc -arch i386" CPP="gcc -E" CXXCPP="g++ -E"
@ -404,8 +404,8 @@ cd ..
And finally we will build Tox: And finally we will build Tox:
```bash ```bash
git clone https://github.com/TokTok/toxcore git clone https://github.com/TokTok/c-toxcore.git c-toxcore
cd toxcore cd c-toxcore
./autogen.sh ./autogen.sh
./configure --host="$WINDOWS_TOOLCHAIN" --prefix="$PREFIX_DIR" --disable-ntox --disable-tests --disable-testing --with-dependency-search="$PREFIX_DIR" --disable-shared --enable-static ./configure --host="$WINDOWS_TOOLCHAIN" --prefix="$PREFIX_DIR" --disable-ntox --disable-tests --disable-testing --with-dependency-search="$PREFIX_DIR" --disable-shared --enable-static
make make
@ -466,7 +466,7 @@ Next, install toxcore library, should either clone this repo by using git, or ju
Assuming that you now have the sources in the toxcore directory: Assuming that you now have the sources in the toxcore directory:
```cmd ```cmd
cd toxcore cd c-toxcore
autoreconf -i autoreconf -i
./configure ./configure
make make