summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2014-09-16 18:50:46 -0400
committerirungentoo <irungentoo@gmail.com>2014-09-16 18:50:46 -0400
commit7ec83c36239871b1747732205b195435866f22a1 (patch)
tree037c73ac3283329b2afef6c6951e59a511ad6264
parentbd625814d142e773bbeb33f3104152d170dd2afe (diff)
parent64830cedcaf03c4e10e48bfdd0db650ff30fcaf5 (diff)
Merge branch 'master' of https://github.com/dubslow/toxcore
-rw-r--r--INSTALL.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 0f22b493..80d73bde 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -62,7 +62,7 @@ cd libsodium
62git checkout tags/0.7.0 62git checkout tags/0.7.0
63./autogen.sh 63./autogen.sh
64./configure && make check 64./configure && make check
65sudo checkinstall --install --pkgname libsodium --pkgversion 0.5.0 --nodoc 65sudo checkinstall --install --pkgname libsodium --pkgversion 0.7.0 --nodoc
66sudo ldconfig 66sudo ldconfig
67cd .. 67cd ..
68``` 68```
@@ -137,7 +137,7 @@ brew list libsodium
137 137
138Configure include and lib folder and build again: 138Configure include and lib folder and build again:
139```bash 139```bash
140./configure --with-libsodium-headers=/usr/local/Cellar/libsodium/0.4.5/include/ --with-libsodium-libs=/usr/local/Cellar/libsodium/0.4.5/lib/ 140./configure --with-libsodium-headers=/usr/local/Cellar/libsodium/0.7.0/include/ --with-libsodium-libs=/usr/local/Cellar/libsodium/0.7.0/lib/
141make 141make
142make install 142make install
143``` 143```
@@ -320,7 +320,7 @@ Now we will build sodium crypto library:
320```bash 320```bash
321git clone https://github.com/jedisct1/libsodium/ 321git clone https://github.com/jedisct1/libsodium/
322cd libsodium 322cd libsodium
323git checkout tags/0.6.1 323git checkout tags/0.7.0
324./autogen.sh 324./autogen.sh
325./configure --host="$WINDOWS_TOOLCHAIN" --prefix="$PREFIX_DIR" --disable-shared --enable-static 325./configure --host="$WINDOWS_TOOLCHAIN" --prefix="$PREFIX_DIR" --disable-shared --enable-static
326make 326make
@@ -374,10 +374,10 @@ When installing MinGW, make sure to select the MSYS option in the installer.
374MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all operations (i.e., generating/running configure script, compiling, etc.) from the MinGW shell. 374MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all operations (i.e., generating/running configure script, compiling, etc.) from the MinGW shell.
375 375
376First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it. 376First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it.
377Assuming that you got the libsodium-0.5.0.tar.gz release: 377Assuming that you got the libsodium-0.7.0.tar.gz release:
378```cmd 378```cmd
379tar -zxvf libsodium-0.5.0.tar.gz 379tar -zxvf libsodium-0.7.0.tar.gz
380cd libsodium-0.5.0 380cd libsodium-0.7.0
381./configure 381./configure
382make 382make
383make install 383make install