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

Fix include paths

Browse Source 
They are relative to the Makefile instead of the source file itself,
which is unintuitive and is messing with my IDE.
This commit is contained in:
Maxim Biro 2016-01-01 01:17:19 -05:00
parent da76da6c95
commit d89fdb230b
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile.am
View File

@ -10,5 +10,5 @@ include ../toxencryptsave/Makefile.inc
include ../toxav/Makefile.inc
include ../other/Makefile.inc
include ../testing/Makefile.inc
include ../other/bootstrap_daemon/Makefile.inc
include ../other/bootstrap_daemon/src/Makefile.inc
include ../auto_tests/Makefile.inc

16
other/bootstrap_daemon/Makefile.inc → other/bootstrap_daemon/src/Makefile.inc
View File

@ -3,16 +3,17 @@ if BUILD_DHT_BOOTSTRAP_DAEMON
bin_PROGRAMS += tox-bootstrapd
tox_bootstrapd_SOURCES = \
../other/bootstrap_daemon/src/tox-bootstrapd.c \
../other/bootstrap_daemon/src/log.c \
../other/bootstrap_daemon/src/log.h \
../other/bootstrap_daemon/src/config.h \
../other/bootstrap_daemon/src/command_line_arguments.c \
../other/bootstrap_daemon/src/command_line_arguments.h \
../other/bootstrap_daemon/src/config.c \
../other/bootstrap_daemon/src/config_defaults.h \
../other/bootstrap_node_packets.h \
../other/bootstrap_daemon/src/config.h \
../other/bootstrap_daemon/src/log.c \
../other/bootstrap_daemon/src/log.h \
../other/bootstrap_daemon/src/tox-bootstrapd.c \
../other/bootstrap_node_packets.c \
../other/bootstrap_daemon/src/command_line_arguments.h \
../other/bootstrap_daemon/src/command_line_arguments.c
../other/bootstrap_node_packets.h
tox_bootstrapd_CFLAGS = \
-I$(top_srcdir)/other/bootstrap_daemon \
@ -32,5 +33,6 @@ endif
EXTRA_DIST += \
$(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.conf \
$(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.service \
$(top_srcdir)/other/bootstrap_daemon/tox-bootstrapd.sh

12
other/bootstrap_daemon/src/tox-bootstrapd.c
View File

@ -30,19 +30,21 @@
#include <string.h>
// toxcore
#include "../../toxcore/LAN_discovery.h"
#include "../../toxcore/onion_announce.h"
#include "../../toxcore/TCP_server.h"
#include "../../toxcore/util.h"
#include "../../../toxcore/LAN_discovery.h"
#include "../../../toxcore/onion_announce.h"
#include "../../../toxcore/TCP_server.h"
#include "../../../toxcore/util.h"
// misc
#include "../bootstrap_node_packets.h"
#include "../../bootstrap_node_packets.h"
#include "command_line_arguments.h"
#include "config.h"
#include "global.h"
#include "log.h"
#define SLEEP_MILLISECONDS(MS) usleep(1000*MS)
// Uses the already existing key or creates one if it didn't exist