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

handle libsodium dependency of misc_tools correctly for autotools

Browse Source
This commit is contained in:
zugz (tox) 2018-08-20 18:11:37 +02:00
parent 7aa57afeba
commit 8e0aea1add
No known key found for this signature in database
GPG Key ID: 6F2BDA289D04F249
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/Makefile.inc
View File

@ -8,6 +8,10 @@ endif
noinst_LTLIBRARIES += libmisc_tools.la noinst_LTLIBRARIES += libmisc_tools.la
libmisc_tools_la_SOURCES = ../testing/misc_tools.c ../testing/misc_tools.h libmisc_tools_la_SOURCES = ../testing/misc_tools.c ../testing/misc_tools.h
libmisc_tools_la_CFLAGS = $(LIBSODIUM_CFLAGS)
libmisc_tools_la_LIBADD = $(LIBSODIUM_LDFLAGS)
if BUILD_TESTING if BUILD_TESTING
noinst_PROGRAMS += DHT_test \ noinst_PROGRAMS += DHT_test \

2
testing/misc_tools.c
View File

@ -40,7 +40,7 @@
#include <string.h> #include <string.h>
#ifndef VANILLA_NACL #ifndef VANILLA_NACL
#include "sodium.h" #include <sodium.h>
#endif #endif
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)