From ee8419701472be9f24c51a41ee7b7ef3cf38f329 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Wed, 29 Aug 2018 01:51:25 +0100 Subject: [PATCH] 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 | 4 ---- src/Bindings/LuaWindow.cpp | 4 ++-- src/Bindings/ManualBindings_RankManager.cpp | 4 ++-- src/Bindings/Plugin.h | 2 +- src/Bindings/PluginManager.h | 4 ++-- src/BlockEntities/BlockEntityWithItems.h | 2 +- src/BlockEntities/CMakeLists.txt | 3 --- src/BlockEntities/EnderChestEntity.h | 2 +- src/BlockEntities/FlowerPotEntity.h | 2 +- src/BlockEntities/JukeboxEntity.cpp | 2 +- src/BlockEntities/MobHeadEntity.h | 4 ++-- src/Blocks/BlockBed.cpp | 2 +- src/Blocks/BlockButton.h | 2 +- src/Blocks/BlockDirt.h | 4 ++-- src/Blocks/BlockDoor.h | 2 +- src/Blocks/BlockFence.h | 4 ++-- src/Blocks/BlockPiston.cpp | 2 +- src/Blocks/BlockRedstoneRepeater.h | 2 +- src/Blocks/BlockSignPost.h | 2 +- src/Blocks/BlockWallSign.h | 2 +- src/Blocks/BroadcastInterface.h | 4 ++-- src/Blocks/ChunkInterface.cpp | 2 +- src/Blocks/WorldInterface.h | 3 ++- src/CMakeLists.txt | 7 ++++--- src/Entities/CMakeLists.txt | 3 --- src/Entities/EnderCrystal.cpp | 2 +- src/Entities/Entity.cpp | 4 ++-- src/Entities/HangingEntity.cpp | 2 +- src/Entities/ItemFrame.cpp | 2 +- src/Entities/LeashKnot.cpp | 6 +++--- src/Entities/Minecart.h | 2 +- src/Entities/Painting.cpp | 2 +- src/Entities/Pawn.cpp | 4 ++-- src/Entities/Player.cpp | 4 ++-- src/Generating/CMakeLists.txt | 3 --- src/Generating/ChunkGenerator.cpp | 4 ++-- src/Generating/PieceStructuresGen.cpp | 2 +- src/Generating/PrefabPiecePool.cpp | 4 ++-- src/HTTP/CMakeLists.txt | 3 --- src/HTTP/HTTPServer.cpp | 2 +- src/HTTP/HTTPServer.h | 4 ++-- src/HTTP/SslHTTPServerConnection.h | 2 +- src/Items/CMakeLists.txt | 3 --- src/Items/ItemItemFrame.h | 2 +- src/Mobs/CMakeLists.txt | 3 --- src/Mobs/Horse.cpp | 2 +- src/Mobs/Horse.h | 2 +- src/Mobs/Monster.cpp | 2 +- src/Mobs/PassiveMonster.cpp | 2 +- src/Mobs/Sheep.cpp | 2 +- src/Mobs/Skeleton.cpp | 2 +- src/Mobs/Slime.cpp | 4 ++-- src/Mobs/Villager.h | 2 +- src/Mobs/Witch.cpp | 2 +- src/Mobs/ZombiePigman.cpp | 2 +- src/Noise/CMakeLists.txt | 3 --- src/OSSupport/CMakeLists.txt | 3 --- src/OSSupport/NetworkSingleton.cpp | 2 +- src/OSSupport/TCPLinkImpl.cpp | 2 +- src/Protocol/Authenticator.cpp | 2 +- src/Protocol/CMakeLists.txt | 3 --- src/Protocol/ChunkDataSerializer.cpp | 2 +- src/Protocol/ChunkDataSerializer.h | 2 +- src/Protocol/ForgeHandshake.h | 2 +- src/Protocol/MojangAPI.cpp | 4 ++-- src/Protocol/Packetizer.cpp | 2 +- src/Protocol/ProtocolRecognizer.cpp | 2 +- src/Protocol/Protocol_1_10.cpp | 2 +- src/Protocol/Protocol_1_8.cpp | 4 ++-- src/Protocol/Protocol_1_8.h | 17 ++--------------- src/Protocol/Protocol_1_9.cpp | 4 ++-- src/Protocol/Protocol_1_9.h | 17 ++--------------- src/Simulator/CMakeLists.txt | 3 --- src/Simulator/FireSimulator.cpp | 2 +- .../IncrementalRedstoneSimulator/CMakeLists.txt | 3 --- .../CommandBlockHandler.h | 2 +- .../IncrementalRedstoneSimulator/DoorHandler.h | 2 +- .../DropSpenserHandler.h | 2 +- .../IncrementalRedstoneSimulator.cpp | 2 +- .../NoteBlockHandler.h | 2 +- .../PistonHandler.h | 2 +- .../PressurePlateHandler.h | 2 +- .../RedstoneComparatorHandler.h | 2 +- .../RedstoneHandler.h | 2 +- .../RedstoneRepeaterHandler.h | 2 +- .../RedstoneToggleHandler.h | 4 ++-- .../TrappedChestHandler.h | 2 +- .../TripwireHookHandler.h | 2 +- src/Simulator/RedstoneSimulator.h | 2 +- src/UI/CMakeLists.txt | 3 --- src/UI/HorseWindow.cpp | 6 +++--- src/UI/SlotArea.cpp | 2 +- src/WorldStorage/CMakeLists.txt | 3 --- src/WorldStorage/EnchantmentSerializer.cpp | 2 +- src/WorldStorage/FireworksSerializer.cpp | 2 +- src/WorldStorage/NBTChunkSerializer.h | 2 +- src/WorldStorage/SchematicFileSerializer.cpp | 2 +- src/WorldStorage/WSSAnvil.cpp | 4 ++-- src/mbedTLS++/BlockingSslClientSocket.h | 2 +- src/mbedTLS++/CMakeLists.txt | 3 --- src/mbedTLS++/SslConfig.cpp | 2 +- src/mbedTLS++/SslContext.cpp | 4 ++-- 102 files changed, 117 insertions(+), 187 deletions(-) diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 2d1d4d57c..b1a19beca 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -1,7 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") -include_directories (".") SET (SRCS Bindings.cpp diff --git a/src/Bindings/LuaWindow.cpp b/src/Bindings/LuaWindow.cpp index ae390e576..f19e9ab7c 100644 --- a/src/Bindings/LuaWindow.cpp +++ b/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" diff --git a/src/Bindings/ManualBindings_RankManager.cpp b/src/Bindings/ManualBindings_RankManager.cpp index d24685d2b..57296e7ca 100644 --- a/src/Bindings/ManualBindings_RankManager.cpp +++ b/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" diff --git a/src/Bindings/Plugin.h b/src/Bindings/Plugin.h index fc0e2b4fc..4214706dd 100644 --- a/src/Bindings/Plugin.h +++ b/src/Bindings/Plugin.h @@ -9,7 +9,7 @@ #pragma once -#include "Defines.h" +#include "../Defines.h" #include "PluginManager.h" diff --git a/src/Bindings/PluginManager.h b/src/Bindings/PluginManager.h index 7a54be8e1..f68a21065 100644 --- a/src/Bindings/PluginManager.h +++ b/src/Bindings/PluginManager.h @@ -2,8 +2,8 @@ #pragma once -#include "Defines.h" -#include "FunctionRef.h" +#include "../Defines.h" +#include "../FunctionRef.h" diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index 65fdf3c0d..f2455699a 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -12,7 +12,7 @@ #include "BlockEntity.h" #include "../ItemGrid.h" #include "../UI/WindowOwner.h" -#include "World.h" +#include "../World.h" diff --git a/src/BlockEntities/CMakeLists.txt b/src/BlockEntities/CMakeLists.txt index f3d0beb55..859b845e6 100644 --- a/src/BlockEntities/CMakeLists.txt +++ b/src/BlockEntities/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS BeaconEntity.cpp diff --git a/src/BlockEntities/EnderChestEntity.h b/src/BlockEntities/EnderChestEntity.h index acd7bbdec..5cd327bb6 100644 --- a/src/BlockEntities/EnderChestEntity.h +++ b/src/BlockEntities/EnderChestEntity.h @@ -2,7 +2,7 @@ #pragma once #include "BlockEntity.h" -#include "UI/WindowOwner.h" +#include "../UI/WindowOwner.h" diff --git a/src/BlockEntities/FlowerPotEntity.h b/src/BlockEntities/FlowerPotEntity.h index 00ddc1442..cf31c7bdf 100644 --- a/src/BlockEntities/FlowerPotEntity.h +++ b/src/BlockEntities/FlowerPotEntity.h @@ -9,7 +9,7 @@ #pragma once #include "BlockEntity.h" -#include "Item.h" +#include "../Item.h" diff --git a/src/BlockEntities/JukeboxEntity.cpp b/src/BlockEntities/JukeboxEntity.cpp index df699b362..8b909adf4 100644 --- a/src/BlockEntities/JukeboxEntity.cpp +++ b/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" diff --git a/src/BlockEntities/MobHeadEntity.h b/src/BlockEntities/MobHeadEntity.h index fe0ae71e4..8072000cd 100644 --- a/src/BlockEntities/MobHeadEntity.h +++ b/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" diff --git a/src/Blocks/BlockBed.cpp b/src/Blocks/BlockBed.cpp index aa816b046..6a5a9ec02 100644 --- a/src/Blocks/BlockBed.cpp +++ b/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" diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index ed4e12482..f81220b36 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -1,7 +1,7 @@ #pragma once #include "BlockHandler.h" -#include "Chunk.h" +#include "../Chunk.h" #include "MetaRotator.h" diff --git a/src/Blocks/BlockDirt.h b/src/Blocks/BlockDirt.h index 99149e5b1..43cadf767 100644 --- a/src/Blocks/BlockDirt.h +++ b/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" diff --git a/src/Blocks/BlockDoor.h b/src/Blocks/BlockDoor.h index 7413b180a..04d63141d 100644 --- a/src/Blocks/BlockDoor.h +++ b/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" diff --git a/src/Blocks/BlockFence.h b/src/Blocks/BlockFence.h index 1cccaa710..7714cb036 100644 --- a/src/Blocks/BlockFence.h +++ b/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" diff --git a/src/Blocks/BlockPiston.cpp b/src/Blocks/BlockPiston.cpp index 3fa421141..c3a90c8a5 100644 --- a/src/Blocks/BlockPiston.cpp +++ b/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" diff --git a/src/Blocks/BlockRedstoneRepeater.h b/src/Blocks/BlockRedstoneRepeater.h index e42f63c3b..455ef1171 100644 --- a/src/Blocks/BlockRedstoneRepeater.h +++ b/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" diff --git a/src/Blocks/BlockSignPost.h b/src/Blocks/BlockSignPost.h index 4af50ad5b..fe170a675 100644 --- a/src/Blocks/BlockSignPost.h +++ b/src/Blocks/BlockSignPost.h @@ -2,7 +2,7 @@ #pragma once #include "BlockHandler.h" -#include "Chunk.h" +#include "../Chunk.h" diff --git a/src/Blocks/BlockWallSign.h b/src/Blocks/BlockWallSign.h index c824bda11..37ca2afae 100644 --- a/src/Blocks/BlockWallSign.h +++ b/src/Blocks/BlockWallSign.h @@ -2,7 +2,7 @@ #pragma once #include "BlockHandler.h" -#include "Chunk.h" +#include "../Chunk.h" diff --git a/src/Blocks/BroadcastInterface.h b/src/Blocks/BroadcastInterface.h index 68a312dde..347ef270b 100644 --- a/src/Blocks/BroadcastInterface.h +++ b/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; diff --git a/src/Blocks/ChunkInterface.cpp b/src/Blocks/ChunkInterface.cpp index 6aa8fbf4f..28dd1ac36 100644 --- a/src/Blocks/ChunkInterface.cpp +++ b/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" diff --git a/src/Blocks/WorldInterface.h b/src/Blocks/WorldInterface.h index e49283402..da9075fb4 100644 --- a/src/Blocks/WorldInterface.h +++ b/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; using cBlockEntityCallback = cFunctionRef; using cPlayerListCallback = cFunctionRef; +using cEntityCallback = cFunctionRef; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 642bc81a3..e895b1657 100644 --- a/src/CMakeLists.txt +++ b/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\"" diff --git a/src/Entities/CMakeLists.txt b/src/Entities/CMakeLists.txt index 9bf49ebca..4c1190800 100644 --- a/src/Entities/CMakeLists.txt +++ b/src/Entities/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS ArrowEntity.cpp diff --git a/src/Entities/EnderCrystal.cpp b/src/Entities/EnderCrystal.cpp index 79d0c50cb..d3725e14a 100644 --- a/src/Entities/EnderCrystal.cpp +++ b/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" diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp index ac9aad92a..4c9900aa9 100644 --- a/src/Entities/Entity.cpp +++ b/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" diff --git a/src/Entities/HangingEntity.cpp b/src/Entities/HangingEntity.cpp index a37d8702e..b3a50c91e 100644 --- a/src/Entities/HangingEntity.cpp +++ b/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" diff --git a/src/Entities/ItemFrame.cpp b/src/Entities/ItemFrame.cpp index a231ebaa3..72b910936 100644 --- a/src/Entities/ItemFrame.cpp +++ b/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" diff --git a/src/Entities/LeashKnot.cpp b/src/Entities/LeashKnot.cpp index 59f08d271..4002e11e3 100644 --- a/src/Entities/LeashKnot.cpp +++ b/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 diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h index 99885faf9..ef5b9e030 100644 --- a/src/Entities/Minecart.h +++ b/src/Entities/Minecart.h @@ -10,7 +10,7 @@ #pragma once #include "Entity.h" -#include "World.h" +#include "../World.h" #include "../UI/WindowOwner.h" diff --git a/src/Entities/Painting.cpp b/src/Entities/Painting.cpp index 507c911af..5f7ab6245 100644 --- a/src/Entities/Painting.cpp +++ b/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" diff --git a/src/Entities/Pawn.cpp b/src/Entities/Pawn.cpp index dc87c5227..ba91258e9 100644 --- a/src/Entities/Pawn.cpp +++ b/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" diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index 8d94ab7c5..cd1414adb 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -4,8 +4,8 @@ #include #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" diff --git a/src/Generating/CMakeLists.txt b/src/Generating/CMakeLists.txt index c7980a096..f01647d0e 100644 --- a/src/Generating/CMakeLists.txt +++ b/src/Generating/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS BioGen.cpp diff --git a/src/Generating/ChunkGenerator.cpp b/src/Generating/ChunkGenerator.cpp index 103920498..166a05ca2 100644 --- a/src/Generating/ChunkGenerator.cpp +++ b/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" diff --git a/src/Generating/PieceStructuresGen.cpp b/src/Generating/PieceStructuresGen.cpp index c1648e258..4f31c6833 100644 --- a/src/Generating/PieceStructuresGen.cpp +++ b/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" diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp index fb8f252c0..16d1f3440 100644 --- a/src/Generating/PrefabPiecePool.cpp +++ b/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" diff --git a/src/HTTP/CMakeLists.txt b/src/HTTP/CMakeLists.txt index 0f12e4e7c..1bd311dc4 100644 --- a/src/HTTP/CMakeLists.txt +++ b/src/HTTP/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS EnvelopeParser.cpp diff --git a/src/HTTP/HTTPServer.cpp b/src/HTTP/HTTPServer.cpp index 24f10ff16..e499d98dc 100644 --- a/src/HTTP/HTTPServer.cpp +++ b/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" diff --git a/src/HTTP/HTTPServer.h b/src/HTTP/HTTPServer.h index fe9f091dc..33f316b51 100644 --- a/src/HTTP/HTTPServer.h +++ b/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" diff --git a/src/HTTP/SslHTTPServerConnection.h b/src/HTTP/SslHTTPServerConnection.h index 6fd3ff309..3ea62c3d9 100644 --- a/src/HTTP/SslHTTPServerConnection.h +++ b/src/HTTP/SslHTTPServerConnection.h @@ -10,7 +10,7 @@ #pragma once #include "HTTPServerConnection.h" -#include "mbedTLS++/BufferedSslContext.h" +#include "../mbedTLS++/BufferedSslContext.h" diff --git a/src/Items/CMakeLists.txt b/src/Items/CMakeLists.txt index af09b32ae..92d12b3b3 100644 --- a/src/Items/CMakeLists.txt +++ b/src/Items/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS ItemHandler.cpp diff --git a/src/Items/ItemItemFrame.h b/src/Items/ItemItemFrame.h index dd3e1f5a8..3136d93e9 100644 --- a/src/Items/ItemItemFrame.h +++ b/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" diff --git a/src/Mobs/CMakeLists.txt b/src/Mobs/CMakeLists.txt index fedff213b..d9969cfdc 100644 --- a/src/Mobs/CMakeLists.txt +++ b/src/Mobs/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS AggressiveMonster.cpp diff --git a/src/Mobs/Horse.cpp b/src/Mobs/Horse.cpp index 9e04bf106..61b25e7a3 100644 --- a/src/Mobs/Horse.cpp +++ b/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" diff --git a/src/Mobs/Horse.h b/src/Mobs/Horse.h index 38625001e..68ad82b56 100644 --- a/src/Mobs/Horse.h +++ b/src/Mobs/Horse.h @@ -2,7 +2,7 @@ #pragma once #include "PassiveMonster.h" -#include "UI/WindowOwner.h" +#include "../UI/WindowOwner.h" diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp index 5327da832..dfcd0dd6a 100644 --- a/src/Mobs/Monster.cpp +++ b/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" diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp index cd0f59153..17b9bddb3 100644 --- a/src/Mobs/PassiveMonster.cpp +++ b/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" diff --git a/src/Mobs/Sheep.cpp b/src/Mobs/Sheep.cpp index 415379034..3276e45a2 100644 --- a/src/Mobs/Sheep.cpp +++ b/src/Mobs/Sheep.cpp @@ -5,7 +5,7 @@ #include "../Entities/Player.h" #include "../World.h" #include "../EffectID.h" -#include "FastRandom.h" +#include "../FastRandom.h" diff --git a/src/Mobs/Skeleton.cpp b/src/Mobs/Skeleton.cpp index e48991a06..2a8ca3ddb 100644 --- a/src/Mobs/Skeleton.cpp +++ b/src/Mobs/Skeleton.cpp @@ -4,7 +4,7 @@ #include "Skeleton.h" #include "../World.h" #include "../Entities/ArrowEntity.h" -#include "ClientHandle.h" +#include "../ClientHandle.h" diff --git a/src/Mobs/Slime.cpp b/src/Mobs/Slime.cpp index 291a3a57f..3198ce801 100644 --- a/src/Mobs/Slime.cpp +++ b/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" diff --git a/src/Mobs/Villager.h b/src/Mobs/Villager.h index 6f3e7b4e8..b9a0b7675 100644 --- a/src/Mobs/Villager.h +++ b/src/Mobs/Villager.h @@ -2,7 +2,7 @@ #pragma once #include "PassiveMonster.h" -#include "Blocks/ChunkInterface.h" +#include "../Blocks/ChunkInterface.h" diff --git a/src/Mobs/Witch.cpp b/src/Mobs/Witch.cpp index 3f56108ae..a4c81a63e 100644 --- a/src/Mobs/Witch.cpp +++ b/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" diff --git a/src/Mobs/ZombiePigman.cpp b/src/Mobs/ZombiePigman.cpp index 2581d3751..7355c8201 100644 --- a/src/Mobs/ZombiePigman.cpp +++ b/src/Mobs/ZombiePigman.cpp @@ -2,7 +2,7 @@ #include "ZombiePigman.h" #include "../World.h" -#include "ClientHandle.h" +#include "../ClientHandle.h" diff --git a/src/Noise/CMakeLists.txt b/src/Noise/CMakeLists.txt index 3e3462900..b099c1766 100644 --- a/src/Noise/CMakeLists.txt +++ b/src/Noise/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS Noise.cpp diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index 55d2dd87a..5513fe5c5 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS CriticalSection.cpp diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp index f855acdc1..046768c14 100644 --- a/src/OSSupport/NetworkSingleton.cpp +++ b/src/OSSupport/NetworkSingleton.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "NetworkSingleton.h" -#include "OSSupport/Network.h" +#include "Network.h" #include #include #include diff --git a/src/OSSupport/TCPLinkImpl.cpp b/src/OSSupport/TCPLinkImpl.cpp index d7edc68cd..63e5fb1da 100644 --- a/src/OSSupport/TCPLinkImpl.cpp +++ b/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" diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp index da4685635..56ef9998c 100644 --- a/src/Protocol/Authenticator.cpp +++ b/src/Protocol/Authenticator.cpp @@ -11,7 +11,7 @@ #include "../IniFile.h" #include "json/json.h" -#include "mbedTLS++/BlockingSslClientSocket.h" +#include "../mbedTLS++/BlockingSslClientSocket.h" diff --git a/src/Protocol/CMakeLists.txt b/src/Protocol/CMakeLists.txt index 5cc7654ba..9fe16900c 100644 --- a/src/Protocol/CMakeLists.txt +++ b/src/Protocol/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS Authenticator.cpp diff --git a/src/Protocol/ChunkDataSerializer.cpp b/src/Protocol/ChunkDataSerializer.cpp index b29981864..a59fee5ac 100644 --- a/src/Protocol/ChunkDataSerializer.cpp +++ b/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" diff --git a/src/Protocol/ChunkDataSerializer.h b/src/Protocol/ChunkDataSerializer.h index 45b0431ab..2f9c950de 100644 --- a/src/Protocol/ChunkDataSerializer.h +++ b/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" diff --git a/src/Protocol/ForgeHandshake.h b/src/Protocol/ForgeHandshake.h index f7be9e958..46e0efaa6 100644 --- a/src/Protocol/ForgeHandshake.h +++ b/src/Protocol/ForgeHandshake.h @@ -6,7 +6,7 @@ #pragma once #include -#include "UUID.h" +#include "../UUID.h" #include "json/json.h" // fwd: diff --git a/src/Protocol/MojangAPI.cpp b/src/Protocol/MojangAPI.cpp index fdaec346f..49e34b66c 100644 --- a/src/Protocol/MojangAPI.cpp +++ b/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" diff --git a/src/Protocol/Packetizer.cpp b/src/Protocol/Packetizer.cpp index 5cae1fad5..749b357b2 100644 --- a/src/Protocol/Packetizer.cpp +++ b/src/Protocol/Packetizer.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "Packetizer.h" -#include "UUID.h" +#include "../UUID.h" diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index 1e7808de3..a8d8b4cf5 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/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" diff --git a/src/Protocol/Protocol_1_10.cpp b/src/Protocol/Protocol_1_10.cpp index d260feca8..8f8ea137c 100644 --- a/src/Protocol/Protocol_1_10.cpp +++ b/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" diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp index a51ad0ca9..3ff92400b 100644 --- a/src/Protocol/Protocol_1_8.cpp +++ b/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" diff --git a/src/Protocol/Protocol_1_8.h b/src/Protocol/Protocol_1_8.h index ececeade8..64a1a9e00 100644 --- a/src/Protocol/Protocol_1_8.h +++ b/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" diff --git a/src/Protocol/Protocol_1_9.cpp b/src/Protocol/Protocol_1_9.cpp index 4a83a4033..d929b4a14 100644 --- a/src/Protocol/Protocol_1_9.cpp +++ b/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" diff --git a/src/Protocol/Protocol_1_9.h b/src/Protocol/Protocol_1_9.h index ee29775f1..d43c2bf09 100644 --- a/src/Protocol/Protocol_1_9.h +++ b/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" diff --git a/src/Simulator/CMakeLists.txt b/src/Simulator/CMakeLists.txt index ab17eebe3..c8514d91d 100644 --- a/src/Simulator/CMakeLists.txt +++ b/src/Simulator/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS DelayedFluidSimulator.cpp diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp index 927a7ae22..df2456455 100644 --- a/src/Simulator/FireSimulator.cpp +++ b/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" diff --git a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt index 15da35db0..fdce1bff5 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt +++ b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") set (SRCS IncrementalRedstoneSimulator.cpp diff --git a/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h index 672a4927b..f059c5fb3 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/CommandBlockEntity.h" +#include "../../BlockEntities/CommandBlockEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h index e1a884337..d29a2f4da 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockDoor.h" +#include "../../Blocks/BlockDoor.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h b/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h index 295afd34e..4dd8b4493 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/DropSpenserEntity.h" +#include "../../BlockEntities/DropSpenserEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp b/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp index 87853f0ff..2c56646fe 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp +++ b/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" diff --git a/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h b/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h index 46fcd6716..347778881 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/NoteEntity.h" +#include "../../BlockEntities/NoteEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h index de001a9e5..b91596be9 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockPiston.h" +#include "../../Blocks/BlockPiston.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h b/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h index 22cfc17f9..8c37c629e 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BoundingBox.h" +#include "../../BoundingBox.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h index 8c33ae266..1f78082c4 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneComparatorHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockComparator.h" +#include "../../Blocks/BlockComparator.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h index 788a3c337..2d0ac97b9 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h @@ -1,7 +1,7 @@ #pragma once -#include "World.h" +#include "../../World.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h index 5f4898804..0263d47cf 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockRedstoneRepeater.h" +#include "../../Blocks/BlockRedstoneRepeater.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h b/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h index d5bf78399..ad64f76db 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h +++ b/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" diff --git a/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h index ea0eaa900..f6bd81930 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "BlockEntities/ChestEntity.h" +#include "../../BlockEntities/ChestEntity.h" diff --git a/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h b/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h index 47225715f..132df3327 100644 --- a/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h +++ b/src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h @@ -2,7 +2,7 @@ #pragma once #include "RedstoneHandler.h" -#include "Blocks/BlockTripwireHook.h" +#include "../../Blocks/BlockTripwireHook.h" diff --git a/src/Simulator/RedstoneSimulator.h b/src/Simulator/RedstoneSimulator.h index 2f6b32398..8a29d7a29 100644 --- a/src/Simulator/RedstoneSimulator.h +++ b/src/Simulator/RedstoneSimulator.h @@ -1,7 +1,7 @@ #pragma once -#include "Simulator/Simulator.h" +#include "Simulator.h" diff --git a/src/UI/CMakeLists.txt b/src/UI/CMakeLists.txt index 32a5af4a5..28a99b6ed 100644 --- a/src/UI/CMakeLists.txt +++ b/src/UI/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS SlotArea.cpp diff --git a/src/UI/HorseWindow.cpp b/src/UI/HorseWindow.cpp index ab060609d..bc15682f1 100644 --- a/src/UI/HorseWindow.cpp +++ b/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" diff --git a/src/UI/SlotArea.cpp b/src/UI/SlotArea.cpp index e3c9bf5e8..e7a6b4407 100644 --- a/src/UI/SlotArea.cpp +++ b/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" diff --git a/src/WorldStorage/CMakeLists.txt b/src/WorldStorage/CMakeLists.txt index afb3ef179..a0875e351 100644 --- a/src/WorldStorage/CMakeLists.txt +++ b/src/WorldStorage/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS EnchantmentSerializer.cpp diff --git a/src/WorldStorage/EnchantmentSerializer.cpp b/src/WorldStorage/EnchantmentSerializer.cpp index 9f477f316..08db91115 100644 --- a/src/WorldStorage/EnchantmentSerializer.cpp +++ b/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) { diff --git a/src/WorldStorage/FireworksSerializer.cpp b/src/WorldStorage/FireworksSerializer.cpp index 91ef35544..891a67e62 100644 --- a/src/WorldStorage/FireworksSerializer.cpp +++ b/src/WorldStorage/FireworksSerializer.cpp @@ -1,7 +1,7 @@ #include "Globals.h" #include "FireworksSerializer.h" -#include "WorldStorage/FastNBT.h" +#include "../WorldStorage/FastNBT.h" diff --git a/src/WorldStorage/NBTChunkSerializer.h b/src/WorldStorage/NBTChunkSerializer.h index 101384739..a7cb1de1e 100644 --- a/src/WorldStorage/NBTChunkSerializer.h +++ b/src/WorldStorage/NBTChunkSerializer.h @@ -9,7 +9,7 @@ #pragma once -#include "ChunkDataCallback.h" +#include "../ChunkDataCallback.h" diff --git a/src/WorldStorage/SchematicFileSerializer.cpp b/src/WorldStorage/SchematicFileSerializer.cpp index 37d5a0c77..655a9a686 100644 --- a/src/WorldStorage/SchematicFileSerializer.cpp +++ b/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" diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp index 30e90f536..db4af6032 100755 --- a/src/WorldStorage/WSSAnvil.cpp +++ b/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" diff --git a/src/mbedTLS++/BlockingSslClientSocket.h b/src/mbedTLS++/BlockingSslClientSocket.h index 32c606535..8cd642707 100644 --- a/src/mbedTLS++/BlockingSslClientSocket.h +++ b/src/mbedTLS++/BlockingSslClientSocket.h @@ -9,7 +9,7 @@ #pragma once -#include "OSSupport/Network.h" +#include "../OSSupport/Network.h" #include "CallbackSslContext.h" diff --git a/src/mbedTLS++/CMakeLists.txt b/src/mbedTLS++/CMakeLists.txt index 2b7e43dce..29c323cc6 100644 --- a/src/mbedTLS++/CMakeLists.txt +++ b/src/mbedTLS++/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") set(SRCS AesCfb128Decryptor.cpp diff --git a/src/mbedTLS++/SslConfig.cpp b/src/mbedTLS++/SslConfig.cpp index c97e29cda..4b7882dcf 100644 --- a/src/mbedTLS++/SslConfig.cpp +++ b/src/mbedTLS++/SslConfig.cpp @@ -1,7 +1,7 @@ #include "Globals.h" -#include "mbedTLS++/SslConfig.h" +#include "SslConfig.h" #include "EntropyContext.h" #include "CtrDrbgContext.h" #include "CryptoKey.h" diff --git a/src/mbedTLS++/SslContext.cpp b/src/mbedTLS++/SslContext.cpp index d5b8525a6..581b8fb50 100644 --- a/src/mbedTLS++/SslContext.cpp +++ b/src/mbedTLS++/SslContext.cpp @@ -4,8 +4,8 @@ // Implements the cSslContext class that holds everything a single SSL context needs to function #include "Globals.h" -#include "mbedTLS++/SslContext.h" -#include "mbedTLS++/SslConfig.h" +#include "../mbedTLS++/SslContext.h" +#include "../mbedTLS++/SslConfig.h"