From: Markus Koschany Date: Tue, 19 Jan 2021 01:15:42 +0100 Subject: jsoncpp Use Debian's system jsoncpp library. --- AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h | 2 +- AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/terrain/ThreatMap.cpp | 2 +- AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp index e01360a..9387aa5 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/module/BuilderManager.cpp @@ -38,7 +38,7 @@ #include "CircuitAI.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "Command.h" #include "Log.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp index 78fce0a..eaebd1e 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/module/EconomyManager.cpp @@ -17,7 +17,7 @@ #include "util/math/LagrangeInterPol.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "AISCommands.h" #include "OOAICallback.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp index dedbafc..485741b 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/module/FactoryManager.cpp @@ -20,7 +20,7 @@ #include "CircuitAI.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "AIFloat3.h" #include "OOAICallback.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp index 0bd5a29..ff61300 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/module/MilitaryManager.cpp @@ -34,7 +34,7 @@ #include "CircuitAI.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "OOAICallback.h" #include "AISCommands.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp b/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp index 8d020d4..b2a3f77 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/resource/EnergyGrid.cpp @@ -14,7 +14,7 @@ #include "CircuitAI.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "lemon/kruskal.h" #include "AISCommands.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp index 657606a..b7974f9 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.cpp @@ -12,7 +12,7 @@ #include "CircuitAI.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "OOAICallback.h" #include "OptionValues.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h index aacf86a..4b61000 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h +++ b/AI/Skirmish/CircuitAI/src/circuit/setup/SetupManager.h @@ -9,7 +9,7 @@ #define SRC_CIRCUIT_STATIC_SETUPMANAGER_H_ #include "unit/CircuitDef.h" -#include "json/json-forwards.h" +#include #include "AIFloat3.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp b/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp index a9691b4..9cd5b9b 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/terrain/TerrainManager.cpp @@ -17,7 +17,7 @@ #include "CircuitAI.h" #include "util/Scheduler.h" #include "util/utils.h" -#include "json/json.h" +#include #include "Map.h" #include "OOAICallback.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/terrain/ThreatMap.cpp b/AI/Skirmish/CircuitAI/src/circuit/terrain/ThreatMap.cpp index 1a790c2..1366469 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/terrain/ThreatMap.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/terrain/ThreatMap.cpp @@ -12,7 +12,7 @@ #include "unit/CircuitUnit.h" #include "unit/EnemyUnit.h" #include "util/utils.h" -#include "json/json.h" +#include #include "OOAICallback.h" #include "Mod.h" diff --git a/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp b/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp index ba368b9..86eb7c8 100644 --- a/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp +++ b/AI/Skirmish/CircuitAI/src/circuit/unit/FactoryData.cpp @@ -12,7 +12,7 @@ #include "terrain/TerrainManager.h" #include "CircuitAI.h" #include "util/utils.h" -#include "json/json.h" +#include #include "Map.h"