From 32449f1fca8379d0c7f38e95834b2a01e62de06c Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 25 Nov 2013 18:29:36 +0000 Subject: Further attempts to fix compile --- 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/Generating/BioGen.cpp | 2 +- src/Generating/ChunkGenerator.cpp | 2 +- src/Generating/CompoGen.cpp | 2 +- src/Generating/ComposableGenerator.cpp | 2 +- src/Generating/DistortedHeightmap.cpp | 2 +- src/Generating/EndGen.cpp | 2 +- src/Generating/HeiGen.cpp | 2 +- src/Generating/Noise3DGenerator.cpp | 2 +- src/HTTPServer/HTTPServer.h | 2 +- src/OSSupport/GZipFile.h | 2 +- src/Protocol/ChunkDataSerializer.cpp | 2 +- src/Protocol/Protocol132.cpp | 2 +- src/Protocol/Protocol132.h | 4 ++-- src/Protocol/Protocol14x.cpp | 2 +- src/Protocol/Protocol17x.h | 4 ++-- src/Simulator/Simulator.h | 2 +- src/WorldStorage/WSSAnvil.cpp | 2 +- src/WorldStorage/WSSCompact.cpp | 4 ++-- src/WorldStorage/WorldStorage.h | 2 +- 24 files changed, 27 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/BlockEntities/ChestEntity.cpp b/src/BlockEntities/ChestEntity.cpp index 3149166fd..0bde5c9f2 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 "../lib/jsoncpp/include/json/json.h" +#include "lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index a05dd5956..d49e4f53b 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 "../lib/jsoncpp/include/json/json.h" +#include "lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index 1b5c03826..8e90ee70d 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/src/BlockEntities/JukeboxEntity.cpp @@ -3,7 +3,7 @@ #include "JukeboxEntity.h" #include "../World.h" -#include "../lib/jsoncpp/include/json/json.h" +#include "lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index 6bb570133..493316bce 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -3,7 +3,7 @@ #include "NoteEntity.h" #include "../World.h" -#include "../lib/jsoncpp/include/json/json.h" +#include "lib/jsoncpp/include/json/json.h" diff --git a/src/BlockEntities/SignEntity.cpp b/src/BlockEntities/SignEntity.cpp index 9cbac5679..39fcb6efc 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 "../lib/jsoncpp/include/json/json.h" +#include "lib/jsoncpp/include/json/json.h" #include "SignEntity.h" #include "../Entities/Player.h" diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp index c05778bb1..4dff50918 100644 --- a/src/Generating/BioGen.cpp +++ b/src/Generating/BioGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "BioGen.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp index a7107e325..cb993bb05 100644 --- a/src/Generating/ChunkGenerator.cpp +++ b/src/Generating/ChunkGenerator.cpp @@ -3,7 +3,7 @@ #include "ChunkGenerator.h" #include "../World.h" -#include "../lib/iniFile/iniFile.h" +#include "lib/iniFile/iniFile.h" #include "../Root.h" #include "../PluginManager.h" #include "ChunkDesc.h" diff --git a/src/Generating/CompoGen.cpp b/src/Generating/CompoGen.cpp index 9b93fcf3b..7e1ade147 100644 --- a/src/Generating/CompoGen.cpp +++ b/src/Generating/CompoGen.cpp @@ -12,7 +12,7 @@ #include "../BlockID.h" #include "../Item.h" #include "../LinearUpscale.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp index 40914605a..496ada52d 100644 --- a/src/Generating/ComposableGenerator.cpp +++ b/src/Generating/ComposableGenerator.cpp @@ -7,7 +7,7 @@ #include "ComposableGenerator.h" #include "../World.h" -#include "../lib/iniFile/iniFile.h" +#include "lib/iniFile/iniFile.h" #include "../Root.h" // Individual composed algorithms: diff --git a/src/Generating/DistortedHeightmap.cpp b/src/Generating/DistortedHeightmap.cpp index ae5cd02e8..6fbe7c1d4 100644 --- a/src/Generating/DistortedHeightmap.cpp +++ b/src/Generating/DistortedHeightmap.cpp @@ -7,7 +7,7 @@ #include "DistortedHeightmap.h" #include "../OSSupport/File.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/EndGen.cpp b/src/Generating/EndGen.cpp index 750a30f91..121ed4488 100644 --- a/src/Generating/EndGen.cpp +++ b/src/Generating/EndGen.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "EndGen.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" #include "../LinearUpscale.h" diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp index 9e656d269..9cc1fbbaa 100644 --- a/src/Generating/HeiGen.cpp +++ b/src/Generating/HeiGen.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "HeiGen.h" #include "../LinearUpscale.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" diff --git a/src/Generating/Noise3DGenerator.cpp b/src/Generating/Noise3DGenerator.cpp index 36ef55e89..9760ca4ca 100644 --- a/src/Generating/Noise3DGenerator.cpp +++ b/src/Generating/Noise3DGenerator.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "Noise3DGenerator.h" #include "../OSSupport/File.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" #include "../LinearInterpolation.h" #include "../LinearUpscale.h" diff --git a/src/HTTPServer/HTTPServer.h b/src/HTTPServer/HTTPServer.h index 65cdcb3a5..ed7a03519 100644 --- a/src/HTTPServer/HTTPServer.h +++ b/src/HTTPServer/HTTPServer.h @@ -11,7 +11,7 @@ #include "../OSSupport/ListenThread.h" #include "../OSSupport/SocketThreads.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" diff --git a/src/OSSupport/GZipFile.h b/src/OSSupport/GZipFile.h index df86717f6..dcc171a2a 100644 --- a/src/OSSupport/GZipFile.h +++ b/src/OSSupport/GZipFile.h @@ -9,7 +9,7 @@ #pragma once -#include "../lib/zlib/zlib.h" +#include "lib/zlib/zlib.h" diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp index c83a87ca9..d406b8b51 100644 --- a/src/Protocol/ChunkDataSerializer.cpp +++ b/src/Protocol/ChunkDataSerializer.cpp @@ -7,7 +7,7 @@ #include "Globals.h" #include "ChunkDataSerializer.h" -#include "../lib/zlib/zlib.h" +#include "lib/zlib/zlib.h" diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp index bfa8eb412..8f7891e4b 100644 --- a/src/Protocol/Protocol132.cpp +++ b/src/Protocol/Protocol132.cpp @@ -5,12 +5,12 @@ #include "Globals.h" #include "ChunkDataSerializer.h" +#include "lib/cryptopp/randpool.h" #include "Protocol132.h" #include "../Root.h" #include "../Server.h" #include "../World.h" #include "../ClientHandle.h" -#include "../lib/cryptopp/randpool.h" #include "../Item.h" #include "../Entities/Player.h" #include "../Mobs/Monster.h" diff --git a/src/Protocol/Protocol132.h b/src/Protocol/Protocol132.h index 58e98c208..2023d7960 100644 --- a/src/Protocol/Protocol132.h +++ b/src/Protocol/Protocol132.h @@ -10,8 +10,8 @@ #pragma once #include "Protocol125.h" -#include "../lib/cryptopp/modes.h" -#include "../lib/cryptopp/aes.h" +#include "lib/cryptopp/modes.h" +#include "lib/cryptopp/aes.h" diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp index 9fb2a8133..ea406d7a2 100644 --- a/src/Protocol/Protocol14x.cpp +++ b/src/Protocol/Protocol14x.cpp @@ -16,7 +16,7 @@ Implements the 1.4.x protocol classes representing these protocols: #include "../Root.h" #include "../Server.h" #include "../ClientHandle.h" -#include "../lib/cryptopp/randpool.h" +#include "lib/cryptopp/randpool.h" #include "../Item.h" #include "ChunkDataSerializer.h" #include "../Entities/Player.h" diff --git a/src/Protocol/Protocol17x.h b/src/Protocol/Protocol17x.h index b55bbf80b..449727854 100644 --- a/src/Protocol/Protocol17x.h +++ b/src/Protocol/Protocol17x.h @@ -16,8 +16,8 @@ Declares the 1.7.x protocol classes: #include "Protocol.h" #include "../ByteBuffer.h" -#include "../lib/cryptopp/modes.h" -#include "../lib/cryptopp/aes.h" +#include "lib/cryptopp/modes.h" +#include "lib/cryptopp/aes.h" diff --git a/src/Simulator/Simulator.h b/src/Simulator/Simulator.h index 9d3ad4131..4f555693d 100644 --- a/src/Simulator/Simulator.h +++ b/src/Simulator/Simulator.h @@ -2,7 +2,7 @@ #pragma once #include "../Vector3i.h" -#include "../lib/inifile/iniFile.h" +#include "lib/inifile/iniFile.h" diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index ee7511486..48163e222 100644 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/src/WorldStorage/WSSAnvil.cpp @@ -7,7 +7,7 @@ #include "WSSAnvil.h" #include "NBTChunkSerializer.h" #include "../World.h" -#include "../lib/zlib/zlib.h" +#include "lib/zlib/zlib.h" #include "../BlockID.h" #include "../BlockEntities/ChestEntity.h" #include "../BlockEntities/DispenserEntity.h" diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp index 812c60411..dafa4d1b5 100644 --- a/src/WorldStorage/WSSCompact.cpp +++ b/src/WorldStorage/WSSCompact.cpp @@ -6,8 +6,8 @@ #include "Globals.h" #include "WSSCompact.h" #include "../World.h" -#include "../lib/zlib/zlib.h" -#include "../lib/jsoncpp/include/json/json.h" +#include "lib/zlib/zlib.h" +#include "lib/jsoncpp/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 384ade081..b2c6dfb4b 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -16,7 +16,7 @@ #include "../ChunkDef.h" #include "../OSSupport/IsThread.h" -#include "../lib/jsoncpp/include/json/json.h" +#include "lib/jsoncpp/include/json/json.h" -- cgit v1.2.3