From ee8419701472be9f24c51a41ee7b7ef3cf38f329 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Wed, 29 Aug 2018 01:51:25 +0100 Subject: 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/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt | 3 --- src/Simulator/IncrementalRedstoneSimulator/CommandBlockHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/DoorHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/DropSpenserHandler.h | 2 +- .../IncrementalRedstoneSimulator/IncrementalRedstoneSimulator.cpp | 2 +- src/Simulator/IncrementalRedstoneSimulator/NoteBlockHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/PistonHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/PressurePlateHandler.h | 2 +- .../IncrementalRedstoneSimulator/RedstoneComparatorHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/RedstoneHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/RedstoneRepeaterHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/RedstoneToggleHandler.h | 4 ++-- src/Simulator/IncrementalRedstoneSimulator/TrappedChestHandler.h | 2 +- src/Simulator/IncrementalRedstoneSimulator/TripwireHookHandler.h | 2 +- 14 files changed, 14 insertions(+), 17 deletions(-) (limited to 'src/Simulator/IncrementalRedstoneSimulator') 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" -- cgit v1.2.3