summaryrefslogtreecommitdiffstats
path: root/src/mbedTLS++
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2018-08-29 02:51:25 +0200
committerGitHub <noreply@github.com>2018-08-29 02:51:25 +0200
commitee8419701472be9f24c51a41ee7b7ef3cf38f329 (patch)
treeb689d4657ec4bb2de7e47f43f670e99b564f85a7 /src/mbedTLS++
parentStore and pass entity effect duration as an int not a short. (#4293) (diff)
downloadcuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.gz
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.bz2
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.lz
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.xz
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.tar.zst
cuberite-ee8419701472be9f24c51a41ee7b7ef3cf38f329.zip
Diffstat (limited to '')
-rw-r--r--src/mbedTLS++/BlockingSslClientSocket.h2
-rw-r--r--src/mbedTLS++/CMakeLists.txt3
-rw-r--r--src/mbedTLS++/SslConfig.cpp2
-rw-r--r--src/mbedTLS++/SslContext.cpp4
4 files changed, 4 insertions, 7 deletions
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"