diff options
author | irungentoo <irungentoo@gmail.com> | 2014-09-16 18:50:46 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-09-16 18:50:46 -0400 |
commit | 7ec83c36239871b1747732205b195435866f22a1 (patch) | |
tree | 037c73ac3283329b2afef6c6951e59a511ad6264 | |
parent | bd625814d142e773bbeb33f3104152d170dd2afe (diff) | |
parent | 64830cedcaf03c4e10e48bfdd0db650ff30fcaf5 (diff) |
Merge branch 'master' of https://github.com/dubslow/toxcore
-rw-r--r-- | INSTALL.md | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -62,7 +62,7 @@ cd libsodium | |||
62 | git checkout tags/0.7.0 | 62 | git checkout tags/0.7.0 |
63 | ./autogen.sh | 63 | ./autogen.sh |
64 | ./configure && make check | 64 | ./configure && make check |
65 | sudo checkinstall --install --pkgname libsodium --pkgversion 0.5.0 --nodoc | 65 | sudo checkinstall --install --pkgname libsodium --pkgversion 0.7.0 --nodoc |
66 | sudo ldconfig | 66 | sudo ldconfig |
67 | cd .. | 67 | cd .. |
68 | ``` | 68 | ``` |
@@ -137,7 +137,7 @@ brew list libsodium | |||
137 | 137 | ||
138 | Configure include and lib folder and build again: | 138 | Configure 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/ |
141 | make | 141 | make |
142 | make install | 142 | make install |
143 | ``` | 143 | ``` |
@@ -320,7 +320,7 @@ Now we will build sodium crypto library: | |||
320 | ```bash | 320 | ```bash |
321 | git clone https://github.com/jedisct1/libsodium/ | 321 | git clone https://github.com/jedisct1/libsodium/ |
322 | cd libsodium | 322 | cd libsodium |
323 | git checkout tags/0.6.1 | 323 | git 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 |
326 | make | 326 | make |
@@ -374,10 +374,10 @@ When installing MinGW, make sure to select the MSYS option in the installer. | |||
374 | MinGW 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. | 374 | MinGW 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 | ||
376 | First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it. | 376 | First download the source tarball from https://download.libsodium.org/libsodium/releases/ and build it. |
377 | Assuming that you got the libsodium-0.5.0.tar.gz release: | 377 | Assuming that you got the libsodium-0.7.0.tar.gz release: |
378 | ```cmd | 378 | ```cmd |
379 | tar -zxvf libsodium-0.5.0.tar.gz | 379 | tar -zxvf libsodium-0.7.0.tar.gz |
380 | cd libsodium-0.5.0 | 380 | cd libsodium-0.7.0 |
381 | ./configure | 381 | ./configure |
382 | make | 382 | make |
383 | make install | 383 | make install |