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/Protocol/Protocol_1_8.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Protocol/Protocol_1_8.cpp') 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" -- cgit v1.2.3