Merge branch 'urras-master'

This commit is contained in:
irungentoo 2015-02-03 13:15:36 -05:00
commit e5644bbd58
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 2 additions and 0 deletions

View File

@ -105,6 +105,8 @@ sudo make install
You need the latest XCode with the Developer Tools (Preferences -> Downloads -> Command Line Tools). You need the latest XCode with the Developer Tools (Preferences -> Downloads -> Command Line Tools).
The following libraries are required along with libsodium and cmake for Mountain Lion and XCode 4.6.3 install libtool, automake and autoconf. You can download them with Homebrew, or install them manually. The following libraries are required along with libsodium and cmake for Mountain Lion and XCode 4.6.3 install libtool, automake and autoconf. You can download them with Homebrew, or install them manually.
**Note: OS X users can also install Toxcore using [osx_build_script_toxcore.sh](other/osx_build_script_toxcore.sh)**
There 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. There 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.
<a name="homebrew" /> <a name="homebrew" />
####Homebrew: ####Homebrew: