moved json.hpp to externals

client/Makefile

@@ -10,7 +10,7 @@ else
 endif
 
 
-CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include
+CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -I../externals/asio/asio/include -I../externals/popl/include
 OBJ       = snapClient.o stream.o clientConnection.o timeProvider.o player/player.o decoder/pcmDecoder.o decoder/flacDecoder.o controller.o ../message/pcmChunk.o ../common/log.o ../message/sampleFormat.o
 
 ifeq ($(TARGET), ANDROID)

client/player/player.h

@@ -23,7 +23,7 @@
 #include <thread>
 #include <atomic>
 #include <vector>
-#include "../stream.h"
+#include "stream.h"
 #include "pcmDevice.h"
 #include "common/endian.h"
 #include "common/log.h"

server/Makefile

@@ -9,7 +9,7 @@ else
   TARGET_DIR ?= /usr
 endif
 
-CXXFLAGS += -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I.. -I../externals/asio/asio/include -I../externals/popl/include
+CXXFLAGS += -std=c++0x -Wall -Wno-unused-function -O3 -pthread -DASIO_STANDALONE -DVERSION=\"$(VERSION)\" -I. -I.. -I../externals/asio/asio/include -I../externals/popl/include
 
 ifeq ($(TARGET), OPENWRT)
 

server/config.h

@@ -23,7 +23,7 @@
 #include <memory>
 #include <vector>
 #include <sys/time.h>
-#include "json/json.hpp"
+#include "externals/json.hpp"
 #include "common/utils.h"
 
 

server/json/jsonrpc.h

@@ -21,7 +21,7 @@
 
 #include <string>
 #include <vector>
-#include "json.hpp"
+#include "externals/json.hpp"
 #include "jsonrpcException.h"
 
 

server/json/jsonrpcException.h

@@ -20,7 +20,7 @@
 #define JSON_RPC_EXCEPTION_H
 
 #include <string>
-#include "json.hpp"
+#include "externals/json.hpp"
 #include "common/snapException.h"
 
 

server/streamreader/fileStream.cpp

@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include "fileStream.h"
-#include "../encoder/encoderFactory.h"
+#include "encoder/encoderFactory.h"
 #include "common/log.h"
 #include "common/snapException.h"
 

server/streamreader/pcmStream.cpp

@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "../encoder/encoderFactory.h"
+#include "encoder/encoderFactory.h"
 #include "common/snapException.h"
 #include "common/compat.h"
 #include "pcmStream.h"

server/streamreader/pcmStream.h

@@ -24,8 +24,8 @@
 #include <string>
 #include <map>
 #include "streamUri.h"
-#include "../encoder/encoder.h"
-#include "../json/json.hpp"
+#include "encoder/encoder.h"
+#include "externals/json.hpp"
 #include "message/sampleFormat.h"
 #include "message/header.h"
 

server/streamreader/pipeStream.cpp

@@ -23,7 +23,7 @@
 #include <cerrno>
 
 #include "pipeStream.h"
-#include "../encoder/encoderFactory.h"
+#include "encoder/encoderFactory.h"
 #include "common/log.h"
 #include "common/snapException.h"
 #include "common/compat.h"

server/streamreader/streamUri.h

@@ -21,7 +21,7 @@
 
 #include <string>
 #include <map>
-#include "../json/json.hpp"
+#include "externals/json.hpp"
 
 using json = nlohmann::json;