From 2113ca384450eb0155c43452690bda08b62cb6aa Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Wed, 27 Nov 2013 09:17:25 +0100 Subject: Fixed VC2008 compilation, normalized include paths. --- src/BlockEntities/ChestEntity.cpp | 2 +- src/BlockEntities/FurnaceEntity.cpp | 2 +- src/BlockEntities/JukeboxEntity.cpp | 2 +- src/BlockEntities/NoteEntity.cpp | 2 +- src/BlockEntities/SignEntity.cpp | 2 +- src/Chunk.cpp | 2 +- src/ChunkMap.cpp | 2 +- src/Entities/Player.cpp | 2 +- src/Inventory.cpp | 2 +- src/Item.cpp | 2 +- src/WorldStorage/WSSCompact.cpp | 2 +- src/WorldStorage/WorldStorage.h | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 918a1df2d..dfbe6ae87 100644 --- a/src/BlockEntities/ChestEntity.cpp +++ b/src/BlockEntities/ChestEntity.cpp @@ -5,7 +5,7 @@ #include "../Item.h" #include "../Entities/Player.h" #include "../UI/Window.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index 0123709bc..b1409f5cc 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -6,7 +6,7 @@ #include "../Entities/Player.h" #include "../Root.h" #include "../Chunk.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index b01d01391..33042179d 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -3,7 +3,7 @@ #include "JukeboxEntity.h" #include "../World.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index 0bae15777..9a33ead62 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -3,7 +3,7 @@ #include "NoteEntity.h" #include "../World.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp index 2e1fc1f8c..df8774377 100644 --- a/src/BlockEntities/SignEntity.cpp +++ b/src/BlockEntities/SignEntity.cpp @@ -4,7 +4,7 @@ // Implements the cSignEntity class representing a single sign in the world #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules -#include "jsoncpp/include/json/json.h" +#include "json/json.h" #include "SignEntity.h" #include "../Entities/Player.h" diff --git a/src/Chunk.cpp b/src/Chunk.cpp index c4aafaa8f..b3b24e339 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -34,7 +34,7 @@ #include "MobSpawner.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp index c58b6b2fa..611e9f24e 100644 --- a/src/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -21,7 +21,7 @@ #endif #include "zlib/zlib.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index a27405839..910613e98 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -25,7 +25,7 @@ #include "../Vector3f.h" #include "inifile/iniFile.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" #define float2int(x) ((x)<0 ? ((int)(x))-1 : (int)(x)) diff --git a/src/Inventory.cpp b/src/Inventory.cpp index b9c7f4aaf..a9b4ab9c5 100644 --- a/src/Inventory.cpp +++ b/src/Inventory.cpp @@ -9,7 +9,7 @@ #include "Root.h" #include "World.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" #include "Items/ItemHandler.h" diff --git a/src/Item.cpp b/src/Item.cpp index 37277e8c8..196a260ef 100644 --- a/src/Item.cpp +++ b/src/Item.cpp @@ -2,7 +2,7 @@ #include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Item.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" #include "Items/ItemHandler.h" diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp index ced84836f..287938b24 100644 --- a/src/WorldStorage/WSSCompact.cpp +++ b/src/WorldStorage/WSSCompact.cpp @@ -7,7 +7,7 @@ #include "WSSCompact.h" #include "../World.h" #include "zlib/zlib.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" #include "../StringCompression.h" #include "../BlockEntities/ChestEntity.h" #include "../BlockEntities/DispenserEntity.h" diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h index 720c04759..98e7e1686 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -16,7 +16,7 @@ #include "../ChunkDef.h" #include "../OSSupport/IsThread.h" -#include "jsoncpp/include/json/json.h" +#include "json/json.h" -- cgit v1.2.3