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/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 ++--------------- 13 files changed, 17 insertions(+), 46 deletions(-) (limited to 'src/Protocol') 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" -- cgit v1.2.3