changing OSX instructions in INSTALL.md to reflect how everything works

This commit is contained in:
rlt3 2013-08-02 13:42:30 -04:00
parent 7097349552
commit 14c8f7f6f8
16 changed files with 28 additions and 16 deletions

View File

@ -55,26 +55,39 @@ make
<a name="osx" />
###OS X:
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.
There are no binaries/executables going to /bin/ or /usr/bin/ now. Everything is compiled and ran from the inside your local branch.
<a name="homebrew" />
####Homebrew:
```
brew install libtool automake autoconf libconfig libsodium cmake
cmake .
make
sudo make install
```
<a name="non-homebrew" />
####Non-homebrew:
Much the same as Linux, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
Users running Mountain Lion and the latest version of XCode (4.6.3) will also need to install libtool, automake and autoconf.
They are easy enough to install, grab them from http://www.gnu.org/software/libtool/, http://www.gnu.org/software/autoconf/ and http://www.gnu.org/software/automake/, then follow these steps for each:
Grab the following packages:
* http://www.gnu.org/software/libtool/
* http://www.gnu.org/software/autoconf/
* http://www.gnu.org/software/automake/
Then follow these steps for each:
```bash
./configure
make
sudo make install
```
In your local TOX repository:
```bash
cmake .
make
```
Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory

BIN
core/libcore.a Normal file

Binary file not shown.

BIN
data Normal file

Binary file not shown.

0
fa.txt Normal file
View File

BIN
other/DHT_bootstrap Executable file

Binary file not shown.

Binary file not shown.

BIN
testing/DHT_test Executable file

Binary file not shown.

BIN
testing/Lossless_UDP_testclient Executable file

Binary file not shown.

BIN
testing/Lossless_UDP_testserver Executable file

Binary file not shown.

View File

@ -155,8 +155,9 @@ int main(int argc, char *argv[])
//bind to ip 0.0.0.0:PORT
IP ip;
ip.i = 0;
//ip.c = 0x7F000001;
init_networking(ip, PORT);
perror("Initialization");
//perror("Initialization");
int connection;
uint64_t timer = current_time();

BIN
testing/Messenger_test Executable file

Binary file not shown.

0
testing/file.txt Normal file
View File

BIN
testing/nTox Executable file

Binary file not shown.

BIN
testing/toxic/data Normal file

Binary file not shown.

View File

@ -282,7 +282,7 @@ void prepare_window(WINDOW* w) {
int main(int argc, char* argv[]) {
int ch;
ToxWindow* a;
ToxWindow* current_window;
init_term();
init_tox();
@ -294,22 +294,20 @@ int main(int argc, char* argv[]) {
do_tox();
// Draw.
a = &windows[w_active];
prepare_window(a->window);
a->blink = false;
a->onDraw(a);
current_window = &windows[w_active];
prepare_window(current_window->window);
current_window->blink = false;
current_window->onDraw(current_window);
draw_bar();
// Handle input.
ch = getch();
if(ch == '\t') {
w_active = (w_active + 1) % w_num;
}
else if(ch == KEY_BTAB) {
} else if(ch == KEY_BTAB) {
w_active = (w_active + w_num - 1) % w_num;
}
else if(ch != ERR) {
a->onKey(a, ch);
} else if(ch != ERR) {
current_window->onKey(current_window, ch);
}
}

BIN
testing/toxic/toxic Executable file

Binary file not shown.