1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
|
From: Markus Koschany <apo@debian.org>
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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/forwards.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#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 <jsoncpp/json/json.h>
#include "Map.h"
|