summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean <sean@tox.im>2014-01-25 19:13:07 -0800
committerSean <sean@tox.im>2014-01-25 19:13:07 -0800
commit934ddff24bac0c99e25942be76f67584845e847f (patch)
tree9b0a82086496e48351f12c2c137dc933f0b02ad5
parent2ead95b56bb11643d6d3edb911e22a52c2fb6b68 (diff)
Fixed reverting install.md
-rw-r--r--INSTALL.md28
1 files changed, 25 insertions, 3 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 4f98831d..5d8cd2c2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -28,7 +28,7 @@ On Fedora:
28```bash 28```bash
29yum groupinstall "Development Tools" 29yum groupinstall "Development Tools"
30yum install libtool autoconf automake libconfig-devel ncurses-devel check check-devel 30yum install libtool autoconf automake libconfig-devel ncurses-devel check check-devel
31``` 31```
32 32
33Note that `libconfig-dev` should be >= 1.4. 33Note that `libconfig-dev` should be >= 1.4.
34 34
@@ -58,7 +58,7 @@ make check
58sudo make install 58sudo make install
59cd .. 59cd ..
60``` 60```
61If your default prefix is /usr/local and you happen to get an error that says "error while loading shared libraries: libtoxcore.so.0: cannot open shared object file: No such file or directory", then you can try running ```sudo ldconfig```, this is an issue common on Linux. If that doesn't fix it, run: 61If your default prefix is /usr/local and you happen to get an error that says "error while loading shared libraries: libtoxcore.so.0: cannot open shared object file: No such file or directory", then you can try running ```sudo ldconfig```. If that doesn't fix it, run:
62``` 62```
63echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf 63echo '/usr/local/lib/' | sudo tee -a /etc/ld.so.conf.d/locallib.conf
64sudo ldconfig 64sudo ldconfig
@@ -104,6 +104,13 @@ The following libraries are required along with libsodium and cmake for Mountain
104There are no binaries/executables going to /bin/ or /usr/bin/ now. Everything is compiled and ran from the inside your local branch. See [Usage](#usage) below. 104There are no binaries/executables going to /bin/ or /usr/bin/ now. Everything is compiled and ran from the inside your local branch. See [Usage](#usage) below.
105<a name="homebrew" /> 105<a name="homebrew" />
106####Homebrew: 106####Homebrew:
107To install from the formula:
108```bash
109brew tap Tox/tox
110brew install --HEAD libtoxcore
111```
112
113To do it manually:
107``` 114```
108brew install libtool automake autoconf libconfig libsodium check 115brew install libtool automake autoconf libconfig libsodium check
109``` 116```
@@ -116,6 +123,21 @@ autoreconf -i
116make 123make
117make install 124make install
118``` 125```
126
127If execution fails with errors like "dyld: Library not loaded: /opt/tox-im/lib/libtoxcore.0.dylib", you may need to specify libsodium path:
128
129Determine paths:
130```
131brew list libsodium
132```
133
134Configure include and lib folder and build again:
135```bash
136./configure--with-libsodium-headers=/usr/local/Cellar/libsodium/0.4.5/include/ --with-libsodium-libs=/usr/local/Cellar/libsodium/0.4.5/lib/
137make
138make install
139```
140
119Advance configure options: 141Advance configure options:
120 - --prefix=/where/to/install 142 - --prefix=/where/to/install
121 - --with-libsodium-headers=/path/to/libsodium/include/ 143 - --with-libsodium-headers=/path/to/libsodium/include/
@@ -183,7 +205,7 @@ You should install:
183 - [MinGW](http://sourceforge.net/projects/mingw/) 205 - [MinGW](http://sourceforge.net/projects/mingw/)
184 206
185When installing MinGW, make sure to select the MSYS option in the installer. 207When installing MinGW, make sure to select the MSYS option in the installer.
186MinGW will install an "MinGW shell" (you should get a shortcut for it), make sure to perform all opeartions (i.e. generating/running configure script, compiling, etc.) from the MinGW shell. 208MinGW 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.
187 209
188First download the source tarball from http://download.libsodium.org/libsodium/releases/ and build it. 210First download the source tarball from http://download.libsodium.org/libsodium/releases/ and build it.
189Assuming that you got the libsodium-0.4.2.tar.gz release: 211Assuming that you got the libsodium-0.4.2.tar.gz release: