ratox

FIFO based tox client
git clone git://git.2f30.org/ratox
Log | Files | Refs | README | LICENSE

commit a1d2b63e6af32685f5828c302a0d3edeeb48090f
parent 6ab4139a1aa0a49ac8fa08429fcf929405f43df6
Author: z3bra <contactatz3bradotorg>
Date:   Mon, 31 Oct 2016 21:25:10 +0100

Compile against local toxcore submodule

Diffstat:
MMakefile | 7++++++-
Mconfig.mk | 8+++++---
Mratox.c | 6+++---
3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile @@ -3,10 +3,13 @@ include config.mk .POSIX: .SUFFIXES: .c .o +TOXSRC = $(shell find toxcore/toxcore toxcore/toxav toxcore/toxencryptsave -name '*.c') + HDR = arg.h config.h readpassphrase.h util.h LIB = \ eprintf.o \ - readpassphrase.o + readpassphrase.o \ + $(TOXSRC:.c=.o) SRC = \ ratox.c @@ -21,6 +24,8 @@ binlib: util.a bin: $(BIN) +$(BIN): util.a $(OBJ) + $(OBJ): $(HDR) config.mk config.h: diff --git a/config.mk b/config.mk @@ -5,8 +5,10 @@ VERSION = 0.2.1 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man +TOX_CFLAGS = -I./toxcore/toxcore -I./toxcore/toxav -I./toxcore/toxencryptsave -I/usr/include/opus + CC = cc LD = $(CC) -CPPFLAGS = -DVERSION=\"${VERSION}\" -CFLAGS = -g -I/usr/local/include -Wall -Wunused $(CPPFLAGS) -LDFLAGS = -g -L/usr/local/lib -ltoxcore -ltoxav -ltoxencryptsave +CPPFLAGS = -DVERSION=\"${VERSION}\" $(TOX_CFLAGS) +CFLAGS = -g -Wall -Wunused $(CPPFLAGS) +LDFLAGS = -g -lopus -lvpx -lpthread -lsodium diff --git a/ratox.c b/ratox.c @@ -17,9 +17,9 @@ #include <time.h> #include <unistd.h> -#include <tox/tox.h> -#include <tox/toxav.h> -#include <tox/toxencryptsave.h> +#include "tox.h" +#include "toxav.h" +#include "toxencryptsave.h" #include "arg.h" #include "queue.h"