From ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 9 May 2015 01:22:33 +0100
Subject: Updated and submodularised JsonCPP

Conflicts:
	lib/jsoncpp
---
 src/CMakeLists.txt | 3 ++-
 src/Root.cpp       | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fcafdbe87..d8a72a360 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -376,4 +376,5 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 	add_flags_lnk(-L/usr/local/lib)
 endif()
 
-target_link_libraries(${EXECUTABLE} luaexpat jsoncpp mbedtls zlib sqlite lua SQLiteCpp event_core event_extra)
+find_library(JSONCPP_LIBRARY jsoncpp ../lib/jsoncpp/src/lib_json)
+target_link_libraries(${EXECUTABLE} luaexpat ${JSONCPP_LIBRARY} mbedtls zlib sqlite lua SQLiteCpp event_core event_extra)
diff --git a/src/Root.cpp b/src/Root.cpp
index 349e85315..3ba391b7f 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -23,6 +23,8 @@
 #include "OverridesSettingsRepository.h"
 #include "SelfTests.h"
 
+#include <iostream>
+
 #ifdef _WIN32
 	#include <conio.h>
 	#include <psapi.h>
-- 
cgit v1.2.3