Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-01-09 22:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into issue-960

Browse Source
This commit is contained in:
Aaron Kimbre 2024-06-06 08:23:41 -05:00
commit 8f00f1601c
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dCommon/dConfig.cpp
View File

@ -1,6 +1,7 @@
#include "dConfig.h" #include "dConfig.h"
#include <sstream> #include <sstream>
#include <algorithm>
#include "BinaryPathFinder.h" #include "BinaryPathFinder.h"
#include "GeneralUtils.h" #include "GeneralUtils.h"

1
dNet/BitStreamUtils.h
View File

@ -5,6 +5,7 @@
#include "MessageIdentifiers.h" #include "MessageIdentifiers.h"
#include "BitStream.h" #include "BitStream.h"
#include <string> #include <string>
#include <algorithm>
enum class eConnectionType : uint16_t; enum class eConnectionType : uint16_t;

5
thirdparty/CMakeLists.txt vendored
View File

@ -23,6 +23,11 @@ if(NOT WIN32)
target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt") target_include_directories(bcrypt PRIVATE "libbcrypt/include/bcrypt")
endif() endif()
# Need to define this on Clang and GNU for 'strdup' support
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
target_compile_definitions(bcrypt PRIVATE "_POSIX_C_SOURCE=200809L")
endif()
target_include_directories(bcrypt INTERFACE "libbcrypt/include") target_include_directories(bcrypt INTERFACE "libbcrypt/include")
target_include_directories(bcrypt PRIVATE "libbcrypt/src") target_include_directories(bcrypt PRIVATE "libbcrypt/src")