diff options
author | Jin^eLD <jin@mediatomb.cc> | 2013-09-05 13:02:26 +0300 |
---|---|---|
committer | Jin^eLD <jin@mediatomb.cc> | 2013-09-06 22:54:45 +0300 |
commit | e092eee869ee4bb78974985321b55a3235c32b4d (patch) | |
tree | 8732ff254fa4fa157e1752e3ec1f6a0dfb01b251 /toxcore/Makefile.inc | |
parent | 64570a1b12d308449aa0d688f7f513847d1dc0f7 (diff) |
Allow to build vs nacl instead of libsodium
By default libsodium is used. Only if --enable-nacl is specified, then
nacl will be used instead of libsodium.
Pass locations of nacl headers and libraries by using the following
options:
--with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/
--with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/
Diffstat (limited to 'toxcore/Makefile.inc')
-rw-r--r-- | toxcore/Makefile.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc index 23584953..5a9002ef 100644 --- a/toxcore/Makefile.inc +++ b/toxcore/Makefile.inc | |||
@@ -29,10 +29,13 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \ | |||
29 | 29 | ||
30 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ | 30 | libtoxcore_la_CFLAGS = -I$(top_srcdir) \ |
31 | -I$(top_srcdir)/toxcore \ | 31 | -I$(top_srcdir)/toxcore \ |
32 | $(LIBSODIUM_CFLAGS) | 32 | $(LIBSODIUM_CFLAGS) \ |
33 | $(NACL_CFLAGS) | ||
33 | 34 | ||
34 | libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \ | 35 | libtoxcore_la_LDFLAGS = $(EXTRA_LT_LDFLAGS) \ |
35 | $(LIBSODIUM_LDFLAGS) \ | 36 | $(LIBSODIUM_LDFLAGS) \ |
37 | $(NACL_LDFLAGS) \ | ||
36 | $(WINSOCK2_LIBS) | 38 | $(WINSOCK2_LIBS) |
37 | 39 | ||
38 | libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) | 40 | libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) \ |
41 | $(NAC_LIBS) | ||