From 158751cb2db8d2e11e38cbc926d0a979f8a8350a Mon Sep 17 00:00:00 2001 From: Jae Kwon Date: Sat, 3 Aug 2013 14:46:52 -0700 Subject: various fixes for first time user * added linking to libsodium * fixed links to docs to point to wiki --- INSTALL.md | 3 ++- core/CMakeLists.txt | 1 + core/DHT.c | 2 +- core/DHT.h | 2 +- core/Lossless_UDP.c | 4 ++-- core/Lossless_UDP.h | 2 +- core/net_crypto.c | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 625a9c6d..483928b0 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -101,6 +101,7 @@ Grab the following packages: * http://www.gnu.org/software/automake/ * http://www.cmake.org/ * https://github.com/jedisct1/libsodium + * http://www.hyperrealm.com/libconfig/ Uncompress and install them all. Make sure to follow the README as the instructions change, but they all follow the same pattern below: @@ -118,7 +119,7 @@ make ``` Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory -and make your life more annoying. +(or the wrong version gets installed) and make your life more annoying. Another thing you may want to install is the latest gcc, this caused me a few problems as XCode from 4.3 no longer includes gcc and instead uses LLVM-GCC, a nice install guide can be found at diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 36acb6cf..5bd496cb 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -17,3 +17,4 @@ set(core_sources Messenger.c) add_library(toxcore SHARED ${core_sources}) +target_link_libraries(toxcore ${SODIUM_LIBRARY}) diff --git a/core/DHT.c b/core/DHT.c index 5d5910e0..08b4710e 100644 --- a/core/DHT.c +++ b/core/DHT.c @@ -1,6 +1,6 @@ /* DHT.c * - * An implementation of the DHT as seen in docs/DHT.txt + * An implementation of the DHT as seen in http://wiki.tox.im/index.php/DHT * * Copyright (C) 2013 Tox project All Rights Reserved. * diff --git a/core/DHT.h b/core/DHT.h index ffa02087..36670ed5 100644 --- a/core/DHT.h +++ b/core/DHT.h @@ -1,6 +1,6 @@ /* DHT.h * - * An implementation of the DHT as seen in docs/DHT.txt + * An implementation of the DHT as seen in http://wiki.tox.im/index.php/DHT * * Copyright (C) 2013 Tox project All Rights Reserved. * diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c index 33b8eb19..a753e5ff 100644 --- a/core/Lossless_UDP.c +++ b/core/Lossless_UDP.c @@ -1,6 +1,6 @@ /* Lossless_UDP.c * - * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt + * An implementation of the Lossless_UDP protocol as seen in http://wiki.tox.im/index.php/Lossless_UDP * * Copyright (C) 2013 Tox project All Rights Reserved. * @@ -467,7 +467,7 @@ uint32_t missing_packets(int connection_id, uint32_t * requested) /* * BEGIN Packet sending functions * One per packet type. - * see docs/Lossless_UDP.txt for more information. + * see http://wiki.tox.im/index.php/Lossless_UDP for more information. */ int send_handshake(IP_Port ip_port, uint32_t handshake_id1, uint32_t handshake_id2) diff --git a/core/Lossless_UDP.h b/core/Lossless_UDP.h index 573e1ab9..75ef273e 100644 --- a/core/Lossless_UDP.h +++ b/core/Lossless_UDP.h @@ -1,6 +1,6 @@ /* Lossless_UDP.h * - * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt + * An implementation of the Lossless_UDP protocol as seen in http://wiki.tox.im/index.php/Lossless_UDP * * Copyright (C) 2013 Tox project All Rights Reserved. * diff --git a/core/net_crypto.c b/core/net_crypto.c index 3b5b67f4..561ba866 100644 --- a/core/net_crypto.c +++ b/core/net_crypto.c @@ -1,7 +1,7 @@ /* net_crypto.c * * Functions for the core network crypto. - * See also: docs/Crypto.txt + * See also: http://wiki.tox.im/index.php/DHT * * NOTE: This code has to be perfect. We don't mess around with encryption. * -- cgit v1.2.3