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/UI/CMakeLists.txt | 3 --- src/UI/HorseWindow.cpp | 6 +++--- src/UI/SlotArea.cpp | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'src/UI') 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" -- cgit v1.2.3