Fix contrib directory to use external ArduinoJson library.

kotl · kotl · commit 6b768f974419 · 2017-11-10T23:43:41.000-05:00
diff --git a/contrib/src/thing/Config.cpp b/contrib/src/thing/Config.cpp
@@ -1,6 +1,6 @@
 #include "Arduino.h"
 #include "thing/Config.h"
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
+#include <ArduinoJson.h>
 
 namespace thing {
 
diff --git a/contrib/src/thing/Config.h b/contrib/src/thing/Config.h
@@ -4,7 +4,7 @@
 #include "Arduino.h"
 #include <string>
 #include <functional>
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
+#include <ArduinoJson.h>
 
 namespace thing {
 
diff --git a/contrib/src/thing/Portal.cpp b/contrib/src/thing/Portal.cpp
@@ -1,5 +1,5 @@
 #include "thing/Portal.h"
-#include "third-party/arduino-json-5.6.7/include/ArduinoJson.h"
+#include <ArduinoJson.h>
 
 namespace thing {
 
diff --git a/contrib/test/Makefile b/contrib/test/Makefile
@@ -16,7 +16,7 @@
 
 FIREBASE_DIR=../..
 GTEST_DIR=googletest/googletest
-ARDUINOJSON_DIR=../../src/third-party/arduino-json-5.6.7
+ARDUINOJSON_DIR=${ARDUINO_HOME}/libraries/ArduinoJson
 
 FIREBASE_SRCS=${FIREBASE_DIR}/src/FirebaseObject.cpp
 GTEST_SRCS=${GTEST_DIR}/src/gtest-all.cpp
@@ -27,7 +27,7 @@ SRCS=FirebaseArduino_test.cpp\
 
 OBJS=${SRCS:.cpp=.o}
 
-CXXFLAGS=-I. -I${FIREBASE_DIR}/src -Igoogletest/googletest/include -Igoogletest/googletest -std=c++11 -g
+CXXFLAGS=-I. -I${FIREBASE_DIR}/src -I${ARDUINOJSON_DIR}/src -Igoogletest/googletest/include -Igoogletest/googletest -std=c++11 -g
 LDFLAGS=-lpthread
 
 all: check
