diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-12 14:46:33 +0200 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-12 14:46:33 +0200 |
| commit | 9b3b0470046bad345f6731d6327ed18ab8f933f2 (patch) | |
| tree | e38c2864ebaff225774f2abb287ffa9ff71f2502 /src | |
| parent | Merge pull request #2328 from SamJBarney/master (diff) | |
| parent | Added JsonCPP library location to search paths (diff) | |
| download | cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.gz cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.bz2 cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.lz cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.xz cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.tar.zst cuberite-9b3b0470046bad345f6731d6327ed18ab8f933f2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Root.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fcafdbe87..6c8fe7d0c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -376,4 +376,4 @@ 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) +target_link_libraries(${EXECUTABLE} luaexpat jsoncpp_lib_static 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> |