diff options
| author | peterbell10 <peterbell10@live.co.uk> | 2018-08-29 02:51:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 02:51:25 +0200 |
| commit | ee8419701472be9f24c51a41ee7b7ef3cf38f329 (patch) | |
| tree | b689d4657ec4bb2de7e47f43f670e99b564f85a7 /src/OSSupport | |
| parent | Store and pass entity effect duration as an int not a short. (#4293) (diff) | |
| download | cuberite-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 'src/OSSupport')
| -rw-r--r-- | src/OSSupport/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/OSSupport/NetworkSingleton.cpp | 2 | ||||
| -rw-r--r-- | src/OSSupport/TCPLinkImpl.cpp | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index 55d2dd87a..5513fe5c5 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -1,6 +1,3 @@ -project (Cuberite) - -include_directories ("${PROJECT_SOURCE_DIR}/../") SET (SRCS CriticalSection.cpp diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp index f855acdc1..046768c14 100644 --- a/src/OSSupport/NetworkSingleton.cpp +++ b/src/OSSupport/NetworkSingleton.cpp @@ -6,7 +6,7 @@ #include "Globals.h" #include "NetworkSingleton.h" -#include "OSSupport/Network.h" +#include "Network.h" #include <event2/thread.h> #include <event2/bufferevent.h> #include <event2/listener.h> diff --git a/src/OSSupport/TCPLinkImpl.cpp b/src/OSSupport/TCPLinkImpl.cpp index d7edc68cd..63e5fb1da 100644 --- a/src/OSSupport/TCPLinkImpl.cpp +++ b/src/OSSupport/TCPLinkImpl.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "TCPLinkImpl.h" -#include "mbedTLS++/SslConfig.h" +#include "../mbedTLS++/SslConfig.h" #include "NetworkSingleton.h" #include "ServerHandleImpl.h" #include "event2/buffer.h" |