summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2015-02-03 13:15:36 -0500
committerirungentoo <irungentoo@gmail.com>2015-02-03 13:15:36 -0500
commite5644bbd58539982c6484e6f155410838ad1a8e9 (patch)
tree5462c1d5cb3e98ae4aa920d8c14fdfabf707e26d
parent16c0736968886369bfbcd0e01cc86d1a279001cc (diff)
parent47cac28df4065c52fb54a732759d551d79e45af7 (diff)
Merge branch 'urras-master'
-rw-r--r--INSTALL.md2
-rw-r--r--other/osx_build_script_toxcore.sh (renamed from osx_build_script_toxcore.txt)0
2 files changed, 2 insertions, 0 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 22865264..c2a8c0d9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -105,6 +105,8 @@ sudo make install
105You need the latest XCode with the Developer Tools (Preferences -> Downloads -> Command Line Tools). 105You need the latest XCode with the Developer Tools (Preferences -> Downloads -> Command Line Tools).
106The 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. 106The 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.
107 107
108**Note: OS X users can also install Toxcore using [osx_build_script_toxcore.sh](other/osx_build_script_toxcore.sh)**
109
108There 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. 110There 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.
109<a name="homebrew" /> 111<a name="homebrew" />
110####Homebrew: 112####Homebrew:
diff --git a/osx_build_script_toxcore.txt b/other/osx_build_script_toxcore.sh
index 8aea0d1c..8aea0d1c 100644
--- a/osx_build_script_toxcore.txt
+++ b/other/osx_build_script_toxcore.sh