StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Moved misc_tools from testing to toxcore.

Browse Source
This commit is contained in:
Anony Moose 2013-08-29 22:54:54 +00:00
parent 31354d80d4
commit eb33796e58
10 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
other/DHT_bootstrap.c
View File

@ -29,7 +29,7 @@
#include "../toxcore/DHT.h" #include "../toxcore/DHT.h"
#include "../toxcore/friend_requests.h" #include "../toxcore/friend_requests.h"
#include "../testing/misc_tools.h" #include "../toxcore/misc_tools.h"
//Sleep function (x = milliseconds) //Sleep function (x = milliseconds)
#ifdef WIN32 #ifdef WIN32

3
other/Makefile.inc
View File

@ -3,8 +3,7 @@ noinst_PROGRAMS += DHT_bootstrap
DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \ DHT_bootstrap_SOURCES = $(top_srcdir)/other/DHT_bootstrap.c \
$(top_srcdir)/toxcore/DHT.h \ $(top_srcdir)/toxcore/DHT.h \
$(top_srcdir)/toxcore/friend_requests.h \ $(top_srcdir)/toxcore/friend_requests.h \
$(top_srcdir)/testing/misc_tools.h \ $(top_srcdir)/toxcore/misc_tools.h
$(top_srcdir)/testing/misc_tools.c
DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \ DHT_bootstrap_CFLAGS = -I$(top_srcdir)/other \
$(LIBSODIUM_CFLAGS) $(LIBSODIUM_CFLAGS)

2
testing/DHT_test.c
View File

@ -30,7 +30,7 @@
//#include "../core/network.h" //#include "../core/network.h"
#include "../toxcore/DHT.h" #include "../toxcore/DHT.h"
#include "../toxcore/friend_requests.h" #include "../toxcore/friend_requests.h"
#include "misc_tools.h" #include "../toxcore/misc_tools.h"
#include <string.h> #include <string.h>

12
testing/Makefile.inc
View File

@ -2,9 +2,7 @@ if BUILD_NTOX
bin_PROGRAMS += nTox bin_PROGRAMS += nTox
nTox_SOURCES = $(top_srcdir)/testing/misc_tools.h \ nTox_SOURCES = $(top_srcdir)/testing/nTox.h \
$(top_srcdir)/testing/misc_tools.c \
$(top_srcdir)/testing/nTox.h \
$(top_srcdir)/testing/nTox.c $(top_srcdir)/testing/nTox.c
nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \ nTox_CFLAGS = $(LIBSODIUM_CFLAGS) \
@ -24,9 +22,7 @@ noinst_PROGRAMS += DHT_test \
Messenger_test \ Messenger_test \
crypto_speed_test crypto_speed_test
DHT_test_SOURCES = $(top_srcdir)/testing/DHT_test.c \ DHT_test_SOURCES = $(top_srcdir)/testing/DHT_test.c
$(top_srcdir)/testing/misc_tools.h \
$(top_srcdir)/testing/misc_tools.c
DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS) DHT_test_CFLAGS = $(LIBSODIUM_CFLAGS)
@ -63,9 +59,7 @@ Lossless_UDP_testserver_LDADD = \
Messenger_test_SOURCES = \ Messenger_test_SOURCES = \
$(top_srcdir)/testing/Messenger_test.c \ $(top_srcdir)/testing/Messenger_test.c
$(top_srcdir)/testing/misc_tools.h \
$(top_srcdir)/testing/misc_tools.c
Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS) Messenger_test_CFLAGS = $(LIBSODIUM_CFLAGS)

2
testing/Messenger_test.c
View File

@ -38,7 +38,7 @@
*/ */
#include "../toxcore/Messenger.h" #include "../toxcore/Messenger.h"
#include "misc_tools.h" #include "../toxcore/misc_tools.h"
#ifdef WIN32 #ifdef WIN32

2
testing/nTox.c
View File

@ -21,7 +21,7 @@
* *
*/ */
#include "nTox.h" #include "nTox.h"
#include "misc_tools.h" #include "../toxcore/misc_tools.h"
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>

2
toxcore/Lossless_UDP.h
View File

@ -25,7 +25,7 @@
#define LOSSLESS_UDP_H #define LOSSLESS_UDP_H
#include "network.h" #include "network.h"
#include "../testing/misc_tools.h" #include "misc_tools.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
toxcore/Makefile.inc
View File

@ -25,7 +25,9 @@ libtoxcore_la_SOURCES = $(top_srcdir)/toxcore/DHT.h \
$(top_srcdir)/toxcore/tox.h \ $(top_srcdir)/toxcore/tox.h \
$(top_srcdir)/toxcore/tox.c \ $(top_srcdir)/toxcore/tox.c \
$(top_srcdir)/toxcore/util.h \ $(top_srcdir)/toxcore/util.h \
$(top_srcdir)/toxcore/util.c $(top_srcdir)/toxcore/util.c \
$(top_srcdir)/toxcore/misc_tools.h \
$(top_srcdir)/toxcore/misc_tools.c
libtoxcore_la_CFLAGS = -I$(top_srcdir) \ libtoxcore_la_CFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/toxcore \ -I$(top_srcdir)/toxcore \

0
testing/misc_tools.c → toxcore/misc_tools.c
View File

0
testing/misc_tools.h → toxcore/misc_tools.h
View File