Force all headers other than "Globals.h" to be included with relative paths (#4269)

Closes #4236

CMake now creates a header file in the build directory under the path "include/Globals.h" which just includes "src/Globals.h" with an absolute path. Then instead of adding "src/" to the include directories, it adds "include/".

#include "Globals.h" still works by including the build generated file and any other src-relative path will not work.

src/Bindings/CMakeLists.txt

@@ -1,7 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
-include_directories (".")
 
 SET (SRCS
 	Bindings.cpp

src/Bindings/LuaWindow.cpp

@@ -7,9 +7,9 @@
 #include "../Entities/Player.h"
 #include "../UI/SlotArea.h"
 #include "PluginLua.h"
-#include "Root.h"
 #include "lua/src/lauxlib.h"  // Needed for LUA_REFNIL
-#include "ClientHandle.h"
+#include "../Root.h"
+#include "../ClientHandle.h"
 
 
 

src/Bindings/ManualBindings_RankManager.cpp

@@ -5,10 +5,10 @@
 
 #include "Globals.h"
 #include "ManualBindings.h"
-#include "../Root.h"
 #include "tolua++/include/tolua++.h"
 #include "LuaState.h"
-#include "UUID.h"
+#include "../Root.h"
+#include "../UUID.h"
 
 
 

src/Bindings/Plugin.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "Defines.h"
+#include "../Defines.h"
 #include "PluginManager.h"
 
 

src/Bindings/PluginManager.h

@@ -2,8 +2,8 @@
 #pragma once
 
 
-#include "Defines.h"
-#include "FunctionRef.h"
+#include "../Defines.h"
+#include "../FunctionRef.h"
 
 
 

src/BlockEntities/BlockEntityWithItems.h

@@ -12,7 +12,7 @@
 #include "BlockEntity.h"
 #include "../ItemGrid.h"
 #include "../UI/WindowOwner.h"
-#include "World.h"
+#include "../World.h"
 
 
 

src/BlockEntities/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	BeaconEntity.cpp

src/BlockEntities/EnderChestEntity.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
 
 
 

src/BlockEntities/FlowerPotEntity.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "Item.h"
+#include "../Item.h"
 
 
 

src/BlockEntities/JukeboxEntity.cpp

@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../EffectID.h"
 #include "json/value.h"
-#include "Entities/Player.h"
+#include "../Entities/Player.h"
 
 
 

src/BlockEntities/MobHeadEntity.h

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "BlockEntity.h"
-#include "Defines.h"
-#include "UUID.h"
+#include "../Defines.h"
+#include "../UUID.h"
 
 
 

src/Blocks/BlockBed.cpp

@@ -5,7 +5,7 @@
 #include "BlockBed.h"
 
 #include "BroadcastInterface.h"
-#include "Entities/Player.h"
+#include "../Entities/Player.h"
 #include "../World.h"
 #include "../BoundingBox.h"
 #include "../Mobs/Monster.h"

src/Blocks/BlockButton.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 #include "MetaRotator.h"
 
 

src/Blocks/BlockDirt.h

@@ -3,8 +3,8 @@
 
 #include "BlockHandler.h"
 #include "../FastRandom.h"
-#include "Root.h"
-#include "Bindings/PluginManager.h"
+#include "../Root.h"
+#include "../Bindings/PluginManager.h"
 
 
 

src/Blocks/BlockDoor.h

@@ -3,7 +3,7 @@
 
 #include "BlockHandler.h"
 #include "../Entities/Player.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 #include "MetaRotator.h"
 #include "ChunkInterface.h"
 #include "BlockSlab.h"

src/Blocks/BlockFence.h

@@ -4,8 +4,8 @@
 #include "BlockHandler.h"
 #include "../BoundingBox.h"
 #include "../EffectID.h"
-#include "Entities/LeashKnot.h"
-#include "BoundingBox.h"
+#include "../Entities/LeashKnot.h"
+#include "../BoundingBox.h"
 #include "../Mobs/PassiveMonster.h"
 
 

src/Blocks/BlockPiston.cpp

@@ -4,7 +4,7 @@
 #include "../Item.h"
 #include "../World.h"
 #include "../Entities/Player.h"
-#include "BlockInServerPluginInterface.h"
+#include "../BlockInServerPluginInterface.h"
 #include "ChunkInterface.h"
 
 

src/Blocks/BlockRedstoneRepeater.h

@@ -2,10 +2,10 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
 #include "MetaRotator.h"
 #include "ChunkInterface.h"
 #include "BlockSlab.h"
+#include "../Chunk.h"
 
 
 

src/Blocks/BlockSignPost.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 

src/Blocks/BlockWallSign.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "BlockHandler.h"
-#include "Chunk.h"
+#include "../Chunk.h"
 
 
 

src/Blocks/BroadcastInterface.h

@@ -1,8 +1,8 @@
 
 #pragma once
 
-#include "Defines.h"
-#include "Scoreboard.h"
+#include "../Defines.h"
+#include "../Scoreboard.h"
 
 // fwd:
 class cClientHandle;

src/Blocks/ChunkInterface.cpp

@@ -2,9 +2,9 @@
 #include "Globals.h"
 
 #include "ChunkInterface.h"
-#include "ChunkMap.h"
 #include "BlockHandler.h"
 #include "WorldInterface.h"
+#include "../ChunkMap.h"
 
 
 

src/Blocks/WorldInterface.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "FunctionRef.h"
+#include "../FunctionRef.h"
 #include "../Mobs/MonsterTypes.h"
 
 class cBedEntity;
@@ -13,6 +13,7 @@ class cPlayer;
 using cBedCallback         = cFunctionRef<bool(cBedEntity   &)>;
 using cBlockEntityCallback = cFunctionRef<bool(cBlockEntity &)>;
 using cPlayerListCallback  = cFunctionRef<bool(cPlayer      &)>;
+using cEntityCallback      = cFunctionRef<bool(cEntity      &)>;
 
 
 

src/CMakeLists.txt

@@ -159,7 +159,10 @@ SET (HDRS
 	XMLParser.h
 )
 
-include_directories(".")
+file(WRITE "${CMAKE_BINARY_DIR}/include/Globals.h"
+	"/* This file allows Globals.h to be included with an absolute path */\n#include \"${PROJECT_SOURCE_DIR}/Globals.h\"\n")
+
+include_directories("${CMAKE_BINARY_DIR}/include")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/sqlite")
 include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/../lib/SQLiteCpp/include")
 include_directories (SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/../lib/TCLAP/include")
@@ -245,8 +248,6 @@ else ()
 	includefolder("Resources")
 	source_group("" FILES ${SOURCE})
 
-	include_directories("${PROJECT_SOURCE_DIR}")
-
 	# Precompiled headers (1st part)
 	SET_SOURCE_FILES_PROPERTIES(
 		Globals.cpp PROPERTIES COMPILE_FLAGS "/Yc\"Globals.h\""

src/Entities/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	ArrowEntity.cpp

src/Entities/EnderCrystal.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "EnderCrystal.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
 #include "../Chunk.h"
 #include "../World.h"
 

src/Entities/Entity.cpp

@@ -2,6 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Entity.h"
+#include "Player.h"
 #include "../World.h"
 #include "../Root.h"
 #include "../Matrix4.h"
@@ -10,8 +11,7 @@
 #include "../Simulator/FluidSimulator.h"
 #include "../Bindings/PluginManager.h"
 #include "../LineBlockTracer.h"
-#include "Player.h"
-#include "Items/ItemHandler.h"
+#include "../Items/ItemHandler.h"
 #include "../FastRandom.h"
 #include "../NetherPortalScanner.h"
 #include "../BoundingBox.h"

src/Entities/HangingEntity.cpp

@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "HangingEntity.h"
-#include "ClientHandle.h"
 #include "Player.h"
+#include "../ClientHandle.h"
 
 
 

src/Entities/ItemFrame.cpp

@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "ItemFrame.h"
-#include "ClientHandle.h"
 #include "Player.h"
+#include "../ClientHandle.h"
 
 
 

src/Entities/LeashKnot.cpp

@@ -2,10 +2,10 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "LeashKnot.h"
-#include "ClientHandle.h"
 #include "Player.h"
-#include "Mobs/Monster.h"
-#include "BoundingBox.h"
+#include "../Mobs/Monster.h"
+#include "../BoundingBox.h"
+#include "../ClientHandle.h"
 
 // Ticks to wait in Tick function to optimize calculations
 #define TICK_STEP 10

src/Entities/Minecart.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "Entity.h"
-#include "World.h"
+#include "../World.h"
 #include "../UI/WindowOwner.h"
 
 

src/Entities/Painting.cpp

@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Painting.h"
-#include "ClientHandle.h"
 #include "Player.h"
+#include "../ClientHandle.h"
 #include "../Chunk.h"
 
 

src/Entities/Pawn.cpp

@@ -5,9 +5,9 @@
 #include "Player.h"
 #include "../World.h"
 #include "../Bindings/PluginManager.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
 #include "../Blocks/BlockHandler.h"
-#include "EffectID.h"
+#include "../EffectID.h"
 #include "../Mobs/Monster.h"
 
 

src/Entities/Player.cpp

@@ -4,8 +4,8 @@
 #include <unordered_map>
 
 #include "Player.h"
-#include "Mobs/Wolf.h"
-#include "Mobs/Horse.h"
+#include "../Mobs/Wolf.h"
+#include "../Mobs/Horse.h"
 #include "../BoundingBox.h"
 #include "../ChatColor.h"
 #include "../Server.h"

src/Generating/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	BioGen.cpp

src/Generating/ChunkGenerator.cpp

@@ -2,11 +2,11 @@
 #include "Globals.h"
 
 #include "ChunkGenerator.h"
-#include "../IniFile.h"
 #include "ChunkDesc.h"
 #include "ComposableGenerator.h"
 #include "Noise3DGenerator.h"
-#include "FastRandom.h"
+#include "../IniFile.h"
+#include "../FastRandom.h"
 
 
 

src/Generating/PieceStructuresGen.cpp

@@ -7,7 +7,7 @@
 #include "PieceStructuresGen.h"
 #include "PrefabStructure.h"
 #include "PieceGeneratorBFSTree.h"
-#include "IniFile.h"
+#include "../IniFile.h"
 #include "../Stopwatch.h"
 
 

src/Generating/PrefabPiecePool.cpp

@@ -5,9 +5,9 @@
 
 #include "Globals.h"
 #include "PrefabPiecePool.h"
-#include "../Bindings/LuaState.h"
-#include "WorldStorage/SchematicFileSerializer.h"
 #include "VerticalStrategy.h"
+#include "../Bindings/LuaState.h"
+#include "../WorldStorage/SchematicFileSerializer.h"
 #include "../StringCompression.h"
 
 

src/HTTP/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	EnvelopeParser.cpp

src/HTTP/HTTPServer.cpp

@@ -9,7 +9,7 @@
 #include "HTTPServerConnection.h"
 #include "HTTPFormParser.h"
 #include "SslHTTPServerConnection.h"
-#include "mbedTLS++/SslConfig.h"
+#include "../mbedTLS++/SslConfig.h"
 
 
 

src/HTTP/HTTPServer.h

@@ -11,8 +11,8 @@
 
 #include "../OSSupport/Network.h"
 #include "../IniFile.h"
-#include "mbedTLS++/CryptoKey.h"
-#include "mbedTLS++/X509Cert.h"
+#include "../mbedTLS++/CryptoKey.h"
+#include "../mbedTLS++/X509Cert.h"
 
 
 

src/HTTP/SslHTTPServerConnection.h

@@ -10,7 +10,7 @@
 #pragma once
 
 #include "HTTPServerConnection.h"
-#include "mbedTLS++/BufferedSslContext.h"
+#include "../mbedTLS++/BufferedSslContext.h"
 
 
 

src/Items/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	ItemHandler.cpp

src/Items/ItemItemFrame.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "ItemHandler.h"
-#include "Entities/ItemFrame.h"
+#include "../Entities/ItemFrame.h"
 #include "../Entities/Player.h"
 
 

src/Mobs/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	AggressiveMonster.cpp

src/Mobs/Horse.cpp

@@ -4,7 +4,7 @@
 #include "../World.h"
 #include "../EffectID.h"
 #include "../Entities/Player.h"
-#include "UI/HorseWindow.h"
+#include "../UI/HorseWindow.h"
 
 
 

src/Mobs/Horse.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "PassiveMonster.h"
-#include "UI/WindowOwner.h"
+#include "../UI/WindowOwner.h"
 
 
 

src/Mobs/Monster.cpp

@@ -11,7 +11,7 @@
 #include "../Entities/Player.h"
 #include "../Entities/ExpOrb.h"
 #include "../MonsterConfig.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
 
 #include "../Chunk.h"
 #include "../FastRandom.h"

src/Mobs/PassiveMonster.cpp

@@ -4,7 +4,7 @@
 #include "PassiveMonster.h"
 #include "../World.h"
 #include "../Entities/Player.h"
-#include "BoundingBox.h"
+#include "../BoundingBox.h"
 #include "../Items/ItemSpawnEgg.h"
 
 

src/Mobs/Sheep.cpp

@@ -5,7 +5,7 @@
 #include "../Entities/Player.h"
 #include "../World.h"
 #include "../EffectID.h"
-#include "FastRandom.h"
+#include "../FastRandom.h"
 
 
 

src/Mobs/Skeleton.cpp

@@ -4,7 +4,7 @@
 #include "Skeleton.h"
 #include "../World.h"
 #include "../Entities/ArrowEntity.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
 
 
 

src/Mobs/Slime.cpp

@@ -2,8 +2,8 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Slime.h"
-#include "FastRandom.h"
-#include "World.h"
+#include "../FastRandom.h"
+#include "../World.h"
 
 
 

src/Mobs/Villager.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "PassiveMonster.h"
-#include "Blocks/ChunkInterface.h"
+#include "../Blocks/ChunkInterface.h"
 
 
 

src/Mobs/Witch.cpp

@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Witch.h"
-#include "FastRandom.h"
+#include "../FastRandom.h"
 
 
 

src/Mobs/ZombiePigman.cpp

@@ -2,7 +2,7 @@
 
 #include "ZombiePigman.h"
 #include "../World.h"
-#include "ClientHandle.h"
+#include "../ClientHandle.h"
 
 
 

src/Noise/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	Noise.cpp

src/OSSupport/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	CriticalSection.cpp

src/OSSupport/NetworkSingleton.cpp

@@ -6,7 +6,7 @@
 
 #include "Globals.h"
 #include "NetworkSingleton.h"
-#include "OSSupport/Network.h"
+#include "Network.h"
 #include <event2/thread.h>
 #include <event2/bufferevent.h>
 #include <event2/listener.h>

src/OSSupport/TCPLinkImpl.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "TCPLinkImpl.h"
-#include "mbedTLS++/SslConfig.h"
+#include "../mbedTLS++/SslConfig.h"
 #include "NetworkSingleton.h"
 #include "ServerHandleImpl.h"
 #include "event2/buffer.h"

src/Protocol/Authenticator.cpp

@@ -11,7 +11,7 @@
 #include "../IniFile.h"
 #include "json/json.h"
 
-#include "mbedTLS++/BlockingSslClientSocket.h"
+#include "../mbedTLS++/BlockingSslClientSocket.h"
 
 
 

src/Protocol/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	Authenticator.cpp

src/Protocol/ChunkDataSerializer.cpp

@@ -8,9 +8,9 @@
 #include "Globals.h"
 #include "ChunkDataSerializer.h"
 #include "zlib/zlib.h"
-#include "ByteBuffer.h"
 #include "Protocol_1_8.h"
 #include "Protocol_1_9.h"
+#include "../ByteBuffer.h"
 
 
 

src/Protocol/ChunkDataSerializer.h

@@ -5,7 +5,7 @@
 //  - serialize chunk data to different protocol versions
 //  - cache such serialized data for multiple clients
 
-#include "ChunkData.h"
+#include "../ChunkData.h"
 
 
 

src/Protocol/ForgeHandshake.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <stddef.h>
-#include "UUID.h"
+#include "../UUID.h"
 #include "json/json.h"
 
 // fwd:

src/Protocol/MojangAPI.cpp

@@ -9,8 +9,8 @@
 #include "SQLiteCpp/Statement.h"
 #include "../IniFile.h"
 #include "json/json.h"
-#include "mbedTLS++/BlockingSslClientSocket.h"
-#include "mbedTLS++/SslConfig.h"
+#include "../mbedTLS++/BlockingSslClientSocket.h"
+#include "../mbedTLS++/SslConfig.h"
 #include "../RankManager.h"
 #include "../OSSupport/IsThread.h"
 #include "../Root.h"

src/Protocol/Packetizer.cpp

@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "Packetizer.h"
-#include "UUID.h"
+#include "../UUID.h"
 
 
 

src/Protocol/ProtocolRecognizer.cpp

@@ -18,7 +18,7 @@
 #include "../Server.h"
 #include "../World.h"
 #include "../ChatColor.h"
-#include "Bindings/PluginManager.h"
+#include "../Bindings/PluginManager.h"
 
 
 

src/Protocol/Protocol_1_10.cpp

@@ -39,7 +39,7 @@ Implements the 1.10 protocol classes:
 #include "../BlockEntities/MobSpawnerEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
 
-#include "Bindings/PluginManager.h"
+#include "../Bindings/PluginManager.h"
 
 
 

src/Protocol/Protocol_1_8.cpp

@@ -11,7 +11,7 @@ Implements the 1.8 protocol classes:
 #include "json/json.h"
 #include "Protocol_1_8.h"
 #include "ChunkDataSerializer.h"
-#include "mbedTLS++/Sha1Checksum.h"
+#include "../mbedTLS++/Sha1Checksum.h"
 #include "Packetizer.h"
 
 #include "../ClientHandle.h"
@@ -46,7 +46,7 @@ Implements the 1.8 protocol classes:
 #include "../BlockEntities/MobHeadEntity.h"
 #include "../BlockEntities/MobSpawnerEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
-#include "Bindings/PluginManager.h"
+#include "../Bindings/PluginManager.h"
 
 
 

src/Protocol/Protocol_1_8.h

@@ -16,21 +16,8 @@ Declares the 1.8 protocol classes:
 #include "Protocol.h"
 #include "../ByteBuffer.h"
 
-#ifdef _MSC_VER
-	#pragma warning(push)
-	#pragma warning(disable:4127)
-	#pragma warning(disable:4244)
-	#pragma warning(disable:4231)
-	#pragma warning(disable:4189)
-	#pragma warning(disable:4702)
-#endif
-
-#ifdef _MSC_VER
-	#pragma warning(pop)
-#endif
-
-#include "mbedTLS++/AesCfb128Decryptor.h"
-#include "mbedTLS++/AesCfb128Encryptor.h"
+#include "../mbedTLS++/AesCfb128Decryptor.h"
+#include "../mbedTLS++/AesCfb128Encryptor.h"
 
 
 

src/Protocol/Protocol_1_9.cpp

@@ -17,7 +17,7 @@ Implements the 1.9 protocol classes:
 #include "json/json.h"
 #include "Protocol_1_9.h"
 #include "ChunkDataSerializer.h"
-#include "mbedTLS++/Sha1Checksum.h"
+#include "../mbedTLS++/Sha1Checksum.h"
 #include "Packetizer.h"
 
 #include "../ClientHandle.h"
@@ -55,7 +55,7 @@ Implements the 1.9 protocol classes:
 #include "../BlockEntities/MobHeadEntity.h"
 #include "../BlockEntities/MobSpawnerEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
-#include "Bindings/PluginManager.h"
+#include "../Bindings/PluginManager.h"
 
 
 

src/Protocol/Protocol_1_9.h

@@ -22,21 +22,8 @@ Declares the 1.9 protocol classes:
 #include "Protocol.h"
 #include "../ByteBuffer.h"
 
-#ifdef _MSC_VER
-	#pragma warning(push)
-	#pragma warning(disable:4127)
-	#pragma warning(disable:4244)
-	#pragma warning(disable:4231)
-	#pragma warning(disable:4189)
-	#pragma warning(disable:4702)
-#endif
-
-#ifdef _MSC_VER
-	#pragma warning(pop)
-#endif
-
-#include "mbedTLS++/AesCfb128Decryptor.h"
-#include "mbedTLS++/AesCfb128Encryptor.h"
+#include "../mbedTLS++/AesCfb128Decryptor.h"
+#include "../mbedTLS++/AesCfb128Encryptor.h"
 
 
 

src/Simulator/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	DelayedFluidSimulator.cpp

src/Simulator/FireSimulator.cpp

@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../Defines.h"
 #include "../Chunk.h"
-#include "Root.h"
+#include "../Root.h"
 #include "../Bindings/PluginManager.h"
 
 

src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 set (SRCS
 	IncrementalRedstoneSimulator.cpp

src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "BlockEntities/CommandBlockEntity.h"
+#include "../../BlockEntities/CommandBlockEntity.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "Blocks/BlockDoor.h"
+#include "../../Blocks/BlockDoor.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "BlockEntities/DropSpenserEntity.h"
+#include "../../BlockEntities/DropSpenserEntity.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp

@@ -3,7 +3,7 @@
 #include "Globals.h"
 
 #include "IncrementalRedstoneSimulator.h"
-#include "Chunk.h"
+#include "../../Chunk.h"
 
 #include "CommandBlockHandler.h"
 #include "DoorHandler.h"

src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "BlockEntities/NoteEntity.h"
+#include "../../BlockEntities/NoteEntity.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "Blocks/BlockPiston.h"
+#include "../../Blocks/BlockPiston.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "BoundingBox.h"
+#include "../../BoundingBox.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "Blocks/BlockComparator.h"
+#include "../../Blocks/BlockComparator.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "World.h"
+#include "../../World.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "Blocks/BlockRedstoneRepeater.h"
+#include "../../Blocks/BlockRedstoneRepeater.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h

@@ -2,8 +2,8 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "Blocks/BlockButton.h"
-#include "Blocks/BlockLever.h"
+#include "../../Blocks/BlockButton.h"
+#include "../../Blocks/BlockLever.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "BlockEntities/ChestEntity.h"
+#include "../../BlockEntities/ChestEntity.h"
 
 
 

src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h

@@ -2,7 +2,7 @@
 #pragma once
 
 #include "RedstoneHandler.h"
-#include "Blocks/BlockTripwireHook.h"
+#include "../../Blocks/BlockTripwireHook.h"
 
 
 

src/Simulator/RedstoneSimulator.h

@@ -1,7 +1,7 @@
 
 #pragma once
 
-#include "Simulator/Simulator.h"
+#include "Simulator.h"
 
 
 

src/UI/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	SlotArea.cpp

src/UI/HorseWindow.cpp

@@ -4,9 +4,9 @@
 // Representing the UI window for a horse entity
 
 #include "Globals.h"
-#include "Mobs/Horse.h"
-#include "UI/HorseWindow.h"
-#include "UI/SlotArea.h"
+#include "../Mobs/Horse.h"
+#include "../UI/HorseWindow.h"
+#include "../UI/SlotArea.h"
 
 
 

src/UI/SlotArea.cpp

@@ -21,7 +21,7 @@
 #include "../BlockArea.h"
 #include "../EffectID.h"
 #include "../ClientHandle.h"
-#include "Mobs/Horse.h"
+#include "../Mobs/Horse.h"
 
 
 

src/WorldStorage/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 SET (SRCS
 	EnchantmentSerializer.cpp

src/WorldStorage/EnchantmentSerializer.cpp

@@ -2,8 +2,8 @@
 #include "Globals.h"
 
 #include "EnchantmentSerializer.h"
-#include "Enchantments.h"
 #include "FastNBT.h"
+#include "../Enchantments.h"
 
 void EnchantmentSerializer::WriteToNBTCompound(const cEnchantments & a_Enchantments, cFastNBTWriter & a_Writer, const AString & a_ListTagName)
 {

src/WorldStorage/FireworksSerializer.cpp

@@ -1,7 +1,7 @@
 
 #include "Globals.h"
 #include "FireworksSerializer.h"
-#include "WorldStorage/FastNBT.h"
+#include "../WorldStorage/FastNBT.h"
 
 
 

src/WorldStorage/NBTChunkSerializer.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "ChunkDataCallback.h"
+#include "../ChunkDataCallback.h"
 
 
 

src/WorldStorage/SchematicFileSerializer.cpp

@@ -5,10 +5,10 @@
 
 #include "Globals.h"
 
-#include "OSSupport/GZipFile.h"
 #include "FastNBT.h"
 #include "SchematicFileSerializer.h"
 #include "../StringCompression.h"
+#include "../OSSupport/GZipFile.h"
 
 
 

src/WorldStorage/WSSAnvil.cpp

@@ -54,8 +54,8 @@
 #include "../Entities/Painting.h"
 
 #include "../Protocol/MojangAPI.h"
-#include "Server.h"
-#include "BoundingBox.h"
+#include "../Server.h"
+#include "../BoundingBox.h"
 
 
 

src/mbedTLS++/BlockingSslClientSocket.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "OSSupport/Network.h"
+#include "../OSSupport/Network.h"
 #include "CallbackSslContext.h"
 
 

src/mbedTLS++/CMakeLists.txt

@@ -1,6 +1,3 @@
-project (Cuberite)
-
-include_directories ("${PROJECT_SOURCE_DIR}/../")
 
 set(SRCS
 	AesCfb128Decryptor.cpp