diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-05-09 02:22:33 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2015-07-10 00:10:51 +0200 |
| commit | ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae (patch) | |
| tree | d7b0e9aab9f4c81c58121c5b06411b25a2efba00 /src | |
| parent | Updated luaexpat (diff) | |
| download | cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.tar cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.tar.gz cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.tar.bz2 cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.tar.lz cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.tar.xz cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.tar.zst cuberite-ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/Root.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
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> |