diff --git a/extern/jsoncpp/src/lib_json/json_reader.cpp b/extern/jsoncpp/src/lib_json/json_reader.cpp index cefcc8c198..86cafcafaa 100644 --- a/extern/jsoncpp/src/lib_json/json_reader.cpp +++ b/extern/jsoncpp/src/lib_json/json_reader.cpp @@ -1,5 +1,5 @@ -#include -#include +#include <../extern/jsoncpp/include/json/reader.h> +#include <../extern/jsoncpp/include/json/value.h> #include #include #include diff --git a/extern/jsoncpp/src/lib_json/json_value.cpp b/extern/jsoncpp/src/lib_json/json_value.cpp index fd773ec119..fb480daa4a 100644 --- a/extern/jsoncpp/src/lib_json/json_value.cpp +++ b/extern/jsoncpp/src/lib_json/json_value.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include <../extern/jsoncpp/include/json/value.h> +#include <../extern/jsoncpp/include/json/writer.h> #include #include #include diff --git a/extern/jsoncpp/src/lib_json/json_writer.cpp b/extern/jsoncpp/src/lib_json/json_writer.cpp index 051d0dcbbb..7868a22cbf 100644 --- a/extern/jsoncpp/src/lib_json/json_writer.cpp +++ b/extern/jsoncpp/src/lib_json/json_writer.cpp @@ -1,4 +1,4 @@ -#include +#include <../extern/jsoncpp/include/json/writer.h> #include #include #include diff --git a/src/JsonUtil.cpp b/src/JsonUtil.cpp index accdff6526..e7eb597e21 100644 --- a/src/JsonUtil.cpp +++ b/src/JsonUtil.cpp @@ -4,8 +4,8 @@ #include "RageUtil.h" #include "RageLog.h" #include "arch/Dialog/Dialog.h" -#include "jsoncpp/include/json/reader.h" -#include "jsoncpp/include/json/writer.h" +#include "../extern/jsoncpp/include/json/reader.h" +#include "../extern/jsoncpp/include/json/writer.h" bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut) { diff --git a/src/JsonUtil.h b/src/JsonUtil.h index d3ba953598..8c17bb1af2 100644 --- a/src/JsonUtil.h +++ b/src/JsonUtil.h @@ -2,7 +2,7 @@ #define JsonUtil_H class RageFileBasic; -#include "jsoncpp/include/json/value.h" +#include "../extern/jsoncpp/include/json/value.h" /** @brief Utilities for handling JSON data. */ namespace JsonUtil { diff --git a/src/ScreenInstallOverlay.cpp b/src/ScreenInstallOverlay.cpp index 31c0341d68..46c82af0e1 100644 --- a/src/ScreenInstallOverlay.cpp +++ b/src/ScreenInstallOverlay.cpp @@ -5,7 +5,7 @@ #include "Preference.h" #include "RageLog.h" #include "FileDownload.h" -#include "jsoncpp/include/json/value.h" +#include "../extern/jsoncpp/include/json/value.h" #include "JsonUtil.h" #include "SpecialFiles.h" class Song; diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj index 010181fbd2..099e404c04 100644 --- a/src/StepMania-net2008.vcproj +++ b/src/StepMania-net2008.vcproj @@ -50,7 +50,7 @@