Update Darwin platform project with solid support for linking libsodium & libjson-c

2017-08-11 01:40:37 -04:00
parent b374d9e04a
commit c0ba96daa2
12 changed files with 1106 additions and 119 deletions
--- a/core/c/mpw-marshall-util.h
+++ b/core/c/mpw-marshall-util.h
@@ -20,7 +20,7 @@
 #define _MPW_MARSHALL_UTIL_H

 #include <time.h>
-#include <json-c/json.h>
+#include "json-c/json.h"

 #include "mpw-algorithm.h"

--- a/core/c/mpw-util.c
+++ b/core/c/mpw-util.c
@@ -31,10 +31,6 @@
 #include <scrypt/sha256.h>
 #elif HAS_SODIUM
 #include "sodium.h"
-#ifdef SODIUM_LIBRARY_MINIMAL
-#include "crypto_stream_aes128ctr.h"
-#include "crypto_kdf_blake2b.h"
-#endif
 #endif

 #include "mpw-util.h"