mirror of
https://github.com/badaix/snapcast.git
synced 2025-06-06 04:41:44 +02:00
Allow including installed jsonrpcpp from a system directory
This commit is contained in:
parent
c4e38b60b0
commit
f28018ada7
6 changed files with 30 additions and 2 deletions
|
@ -20,7 +20,12 @@
|
|||
#define JSON_MESSAGE_H
|
||||
|
||||
#include "message.h"
|
||||
|
||||
#ifdef HAS_JSONRPCPP
|
||||
#include <jsonrpcpp/json.hpp>
|
||||
#else
|
||||
#include "externals/json.hpp"
|
||||
#endif
|
||||
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
#include <memory>
|
||||
#include <vector>
|
||||
#include <sys/time.h>
|
||||
|
||||
#ifdef HAS_JSONRPCPP
|
||||
#include <jsonrpcpp/json.hpp>
|
||||
#else
|
||||
#include "externals/json.hpp"
|
||||
#include "common/utils/string_utils.h"
|
||||
#include "common/utils.h"
|
||||
|
|
|
@ -16,12 +16,17 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#ifdef HAS_JSONRPCPP
|
||||
#include <jsonrpcpp/jsonrp.hpp>
|
||||
#else
|
||||
#include "jsonrp.hpp"
|
||||
#endif
|
||||
|
||||
#include "controlServer.h"
|
||||
#include "message/time.h"
|
||||
#include "aixlog.hpp"
|
||||
#include "common/utils.h"
|
||||
#include "common/snapException.h"
|
||||
#include "jsonrp.hpp"
|
||||
#include "config.h"
|
||||
#include <iostream>
|
||||
|
||||
|
|
|
@ -27,7 +27,12 @@
|
|||
#include <sstream>
|
||||
#include <mutex>
|
||||
|
||||
#ifdef HAS_JSONRPCPP
|
||||
#include <jsonrpcpp/jsonrp.hpp>
|
||||
#else
|
||||
#include "jsonrp.hpp"
|
||||
#endif
|
||||
|
||||
#include "streamSession.h"
|
||||
#include "streamreader/streamManager.h"
|
||||
#include "common/queue.h"
|
||||
|
|
|
@ -27,11 +27,15 @@
|
|||
#include <map>
|
||||
#include "streamUri.h"
|
||||
#include "encoder/encoder.h"
|
||||
#include "externals/json.hpp"
|
||||
#include "common/sampleFormat.h"
|
||||
#include "message/codecHeader.h"
|
||||
#include "message/streamTags.h"
|
||||
|
||||
#ifdef HAS_JSONRPCPP
|
||||
#include <jsonrpcpp/json.hpp>
|
||||
#else
|
||||
#include "externals/json.hpp"
|
||||
#endif
|
||||
|
||||
class PcmStream;
|
||||
|
||||
|
|
|
@ -21,7 +21,12 @@
|
|||
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
#ifdef HAS_JSONRPCPP
|
||||
#include <jsonrpcpp/json.hpp>
|
||||
#else
|
||||
#include "externals/json.hpp"
|
||||
#endif
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue