summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Malte Gräfje <Tim.Graefje@gmx.de>2013-08-04 02:17:14 +0200
committerTim Malte Gräfje <Tim.Graefje@gmx.de>2013-08-04 02:17:14 +0200
commit170af10204d2698374725f10195eab281551d9a2 (patch)
treebf53fe03ec445286be88aa4edf880a09dc1db999
parent5817c2c888ec930b8adfca78cd4fd5b026a1ccfa (diff)
parent6f0ae0dbb483f7cb11ed735eac235e3367ccb019 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--INSTALL.md3
-rw-r--r--core/CMakeLists.txt1
-rw-r--r--core/DHT.c2
-rw-r--r--core/DHT.h2
-rw-r--r--core/Lossless_UDP.c4
-rw-r--r--core/Lossless_UDP.h2
-rw-r--r--core/net_crypto.c2
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:
101 * http://www.gnu.org/software/automake/ 101 * http://www.gnu.org/software/automake/
102 * http://www.cmake.org/ 102 * http://www.cmake.org/
103 * https://github.com/jedisct1/libsodium 103 * https://github.com/jedisct1/libsodium
104 * http://www.hyperrealm.com/libconfig/
104 105
105Uncompress and install them all. Make sure to follow the README as the instructions change, but they all follow the same pattern below: 106Uncompress and install them all. Make sure to follow the README as the instructions change, but they all follow the same pattern below:
106 107
@@ -118,7 +119,7 @@ make
118``` 119```
119 120
120Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory 121Do not install them from macports (or any dependencies for that matter) as they get shoved in the wrong directory
121and make your life more annoying. 122(or the wrong version gets installed) and make your life more annoying.
122 123
123Another thing you may want to install is the latest gcc, this caused me a few problems as XCode from 4.3 124Another thing you may want to install is the latest gcc, this caused me a few problems as XCode from 4.3
124no longer includes gcc and instead uses LLVM-GCC, a nice install guide can be found at 125no 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
17 Messenger.c) 17 Messenger.c)
18 18
19add_library(toxcore SHARED ${core_sources}) 19add_library(toxcore SHARED ${core_sources})
20target_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 @@
1/* DHT.c 1/* DHT.c
2 * 2 *
3 * An implementation of the DHT as seen in docs/DHT.txt 3 * An implementation of the DHT as seen in http://wiki.tox.im/index.php/DHT
4 * 4 *
5 * Copyright (C) 2013 Tox project All Rights Reserved. 5 * Copyright (C) 2013 Tox project All Rights Reserved.
6 * 6 *
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 @@
1/* DHT.h 1/* DHT.h
2 * 2 *
3 * An implementation of the DHT as seen in docs/DHT.txt 3 * An implementation of the DHT as seen in http://wiki.tox.im/index.php/DHT
4 * 4 *
5 * Copyright (C) 2013 Tox project All Rights Reserved. 5 * Copyright (C) 2013 Tox project All Rights Reserved.
6 * 6 *
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 @@
1/* Lossless_UDP.c 1/* Lossless_UDP.c
2 * 2 *
3 * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt 3 * An implementation of the Lossless_UDP protocol as seen in http://wiki.tox.im/index.php/Lossless_UDP
4 * 4 *
5 * Copyright (C) 2013 Tox project All Rights Reserved. 5 * Copyright (C) 2013 Tox project All Rights Reserved.
6 * 6 *
@@ -467,7 +467,7 @@ uint32_t missing_packets(int connection_id, uint32_t * requested)
467/* 467/*
468 * BEGIN Packet sending functions 468 * BEGIN Packet sending functions
469 * One per packet type. 469 * One per packet type.
470 * see docs/Lossless_UDP.txt for more information. 470 * see http://wiki.tox.im/index.php/Lossless_UDP for more information.
471 */ 471 */
472 472
473int send_handshake(IP_Port ip_port, uint32_t handshake_id1, uint32_t handshake_id2) 473int 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 @@
1/* Lossless_UDP.h 1/* Lossless_UDP.h
2 * 2 *
3 * An implementation of the Lossless_UDP protocol as seen in docs/Lossless_UDP.txt 3 * An implementation of the Lossless_UDP protocol as seen in http://wiki.tox.im/index.php/Lossless_UDP
4 * 4 *
5 * Copyright (C) 2013 Tox project All Rights Reserved. 5 * Copyright (C) 2013 Tox project All Rights Reserved.
6 * 6 *
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 @@
1/* net_crypto.c 1/* net_crypto.c
2 * 2 *
3 * Functions for the core network crypto. 3 * Functions for the core network crypto.
4 * See also: docs/Crypto.txt 4 * See also: http://wiki.tox.im/index.php/DHT
5 * 5 *
6 * NOTE: This code has to be perfect. We don't mess around with encryption. 6 * NOTE: This code has to be perfect. We don't mess around with encryption.
7 * 7 *