From 72372feff693b18dd99213d6eac20ce340502539 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Sat, 21 Dec 2024 12:47:25 +0100 Subject: [PATCH] Fix build against system jsoncpp --- src/JsonUtil.cpp | 2 +- src/JsonUtil.h | 2 +- src/NotesLoaderJson.cpp | 2 +- src/NotesWriterJson.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/JsonUtil.cpp b/src/JsonUtil.cpp index 8e440b244f..27f2b9533e 100644 --- a/src/JsonUtil.cpp +++ b/src/JsonUtil.cpp @@ -4,7 +4,7 @@ #include "RageUtil.h" #include "RageLog.h" #include "arch/Dialog/Dialog.h" -#include "json/json.h" +#include bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut) { diff --git a/src/JsonUtil.h b/src/JsonUtil.h index ea0f7701f5..a04d0607c2 100644 --- a/src/JsonUtil.h +++ b/src/JsonUtil.h @@ -3,7 +3,7 @@ #define JsonUtil_H class RageFileBasic; -#include "json/json.h" +#include namespace JsonUtil { diff --git a/src/NotesLoaderJson.cpp b/src/NotesLoaderJson.cpp index a57fbcb404..22c98a56a4 100644 --- a/src/NotesLoaderJson.cpp +++ b/src/NotesLoaderJson.cpp @@ -1,6 +1,6 @@ #include "global.h" #include "NotesLoaderJson.h" -#include "json/json.h" +#include #include "TimingData.h" #include "RageUtil.h" #include "JsonUtil.h" diff --git a/src/NotesWriterJson.cpp b/src/NotesWriterJson.cpp index e89a8e6df1..45bbd18d46 100644 --- a/src/NotesWriterJson.cpp +++ b/src/NotesWriterJson.cpp @@ -1,7 +1,7 @@ #include "global.h" #include "NotesWriterJson.h" #include "TimingData.h" -#include "json/json.h" +#include #include "JsonUtil.h" #include "Song.h" #include "BackgroundUtil.h" -- 2.47.1