diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | core/CMakeLists.txt | 3 | ||||
-rw-r--r-- | other/DHT_bootstrap.c | 2 | ||||
-rw-r--r-- | other/cmake/DHT_bootstrap.cmake | 2 | ||||
-rw-r--r-- | testing/DHT_cryptosendfiletest.c | 2 | ||||
-rw-r--r-- | testing/DHT_test.c | 2 | ||||
-rw-r--r-- | testing/Messenger_test.c | 2 | ||||
-rw-r--r-- | testing/cmake/DHT_cryptosendfiletest.cmake | 4 | ||||
-rw-r--r-- | testing/cmake/DHT_test.cmake | 2 | ||||
-rw-r--r-- | testing/cmake/Messenger_test.cmake | 2 | ||||
-rw-r--r-- | testing/cmake/nTox.cmake | 2 | ||||
-rw-r--r-- | testing/misc_tools.c (renamed from core/misc_tools.c) | 0 | ||||
-rw-r--r-- | testing/misc_tools.h (renamed from core/misc_tools.h) | 0 | ||||
-rw-r--r-- | testing/nTox.c | 3 |
14 files changed, 14 insertions, 13 deletions
@@ -11,3 +11,4 @@ cmake_install.cmake | |||
11 | install_manifest.txt | 11 | install_manifest.txt |
12 | 12 | ||
13 | testing/data | 13 | testing/data |
14 | *~ | ||
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 7e5c119a..6ddd5b9b 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt | |||
@@ -12,7 +12,6 @@ set(core_sources | |||
12 | net_crypto.c | 12 | net_crypto.c |
13 | friend_requests.c | 13 | friend_requests.c |
14 | LAN_discovery.c | 14 | LAN_discovery.c |
15 | Messenger.c | 15 | Messenger.c) |
16 | misc_tools.c) | ||
17 | 16 | ||
18 | add_library(core ${core_sources}) | 17 | add_library(core ${core_sources}) |
diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c index 61901a15..19714e70 100644 --- a/other/DHT_bootstrap.c +++ b/other/DHT_bootstrap.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include "../core/DHT.h" | 30 | #include "../core/DHT.h" |
31 | #include "../core/friend_requests.h" | 31 | #include "../core/friend_requests.h" |
32 | #include "../core/misc_tools.h" | 32 | #include "../testing/misc_tools.h" |
33 | 33 | ||
34 | //Sleep function (x = milliseconds) | 34 | //Sleep function (x = milliseconds) |
35 | #ifdef WIN32 | 35 | #ifdef WIN32 |
diff --git a/other/cmake/DHT_bootstrap.cmake b/other/cmake/DHT_bootstrap.cmake index c3c313ae..e2b164ba 100644 --- a/other/cmake/DHT_bootstrap.cmake +++ b/other/cmake/DHT_bootstrap.cmake | |||
@@ -4,6 +4,6 @@ project(DHT_bootstrap C) | |||
4 | set(exe_name DHT_bootstrap) | 4 | set(exe_name DHT_bootstrap) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | DHT_bootstrap.c) | 7 | DHT_bootstrap.c ../testing/misc_tools.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c index 23423497..c7c33531 100644 --- a/testing/DHT_cryptosendfiletest.c +++ b/testing/DHT_cryptosendfiletest.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include "../core/network.h" | 38 | #include "../core/network.h" |
39 | #include "../core/DHT.h" | 39 | #include "../core/DHT.h" |
40 | #include "../core/net_crypto.h" | 40 | #include "../core/net_crypto.h" |
41 | #include "../core/misc_tools.h" | 41 | #include "misc_tools.h" |
42 | 42 | ||
43 | #include <string.h> | 43 | #include <string.h> |
44 | 44 | ||
diff --git a/testing/DHT_test.c b/testing/DHT_test.c index 92845b7e..2e9c2ac2 100644 --- a/testing/DHT_test.c +++ b/testing/DHT_test.c | |||
@@ -30,7 +30,7 @@ | |||
30 | //#include "../core/network.h" | 30 | //#include "../core/network.h" |
31 | #include "../core/DHT.c" | 31 | #include "../core/DHT.c" |
32 | #include "../core/friend_requests.c" | 32 | #include "../core/friend_requests.c" |
33 | #include "../core/misc_tools.h" | 33 | #include "misc_tools.h" |
34 | 34 | ||
35 | #include <string.h> | 35 | #include <string.h> |
36 | 36 | ||
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c index 6ad5c7dd..0518d284 100644 --- a/testing/Messenger_test.c +++ b/testing/Messenger_test.c | |||
@@ -38,7 +38,7 @@ | |||
38 | */ | 38 | */ |
39 | 39 | ||
40 | #include "../core/Messenger.h" | 40 | #include "../core/Messenger.h" |
41 | #include "../core/misc_tools.h" | 41 | #include "misc_tools.h" |
42 | 42 | ||
43 | #ifdef WIN32 | 43 | #ifdef WIN32 |
44 | 44 | ||
diff --git a/testing/cmake/DHT_cryptosendfiletest.cmake b/testing/cmake/DHT_cryptosendfiletest.cmake index 8d6079f8..c98a2bcd 100644 --- a/testing/cmake/DHT_cryptosendfiletest.cmake +++ b/testing/cmake/DHT_cryptosendfiletest.cmake | |||
@@ -4,6 +4,6 @@ project(DHT_cryptosendfiletest C) | |||
4 | set(exe_name DHT_cryptosendfiletest) | 4 | set(exe_name DHT_cryptosendfiletest) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | DHT_cryptosendfiletest.c) | 7 | DHT_cryptosendfiletest.c misc_tools.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) \ No newline at end of file | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/DHT_test.cmake b/testing/cmake/DHT_test.cmake index bcde4370..74fdf35d 100644 --- a/testing/cmake/DHT_test.cmake +++ b/testing/cmake/DHT_test.cmake | |||
@@ -4,6 +4,6 @@ project(DHT_test C) | |||
4 | set(exe_name DHT_test) | 4 | set(exe_name DHT_test) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | DHT_test.c) | 7 | DHT_test.c misc_tools.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/Messenger_test.cmake b/testing/cmake/Messenger_test.cmake index a85e043d..b2f54d0a 100644 --- a/testing/cmake/Messenger_test.cmake +++ b/testing/cmake/Messenger_test.cmake | |||
@@ -4,6 +4,6 @@ project(Messenger_test C) | |||
4 | set(exe_name Messenger_test) | 4 | set(exe_name Messenger_test) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | Messenger_test.c) | 7 | Messenger_test.c misc_tools.c) |
8 | 8 | ||
9 | linkCoreLibraries(${exe_name}) | 9 | linkCoreLibraries(${exe_name}) |
diff --git a/testing/cmake/nTox.cmake b/testing/cmake/nTox.cmake index 1656bc80..4c6905e5 100644 --- a/testing/cmake/nTox.cmake +++ b/testing/cmake/nTox.cmake | |||
@@ -4,7 +4,7 @@ project(nTox C) | |||
4 | set(exe_name nTox) | 4 | set(exe_name nTox) |
5 | 5 | ||
6 | add_executable(${exe_name} | 6 | add_executable(${exe_name} |
7 | nTox.c) | 7 | nTox.c misc_tools.c) |
8 | 8 | ||
9 | target_link_libraries(${exe_name} ncurses) | 9 | target_link_libraries(${exe_name} ncurses) |
10 | 10 | ||
diff --git a/core/misc_tools.c b/testing/misc_tools.c index 34d64bf4..34d64bf4 100644 --- a/core/misc_tools.c +++ b/testing/misc_tools.c | |||
diff --git a/core/misc_tools.h b/testing/misc_tools.h index 29b37ce5..29b37ce5 100644 --- a/core/misc_tools.h +++ b/testing/misc_tools.h | |||
diff --git a/testing/nTox.c b/testing/nTox.c index e202a697..7ba31110 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -22,7 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "nTox.h" | 24 | #include "nTox.h" |
25 | #include "../core/misc_tools.h" | 25 | #include "misc_tools.h" |
26 | |||
26 | #include <stdio.h> | 27 | #include <stdio.h> |
27 | #include <time.h> | 28 | #include <time.h> |
28 | #ifdef WIN32 | 29 | #ifdef WIN32 |