working

f
DarkflameUniverse · Dec 30, 2023 · df46e66 · df46e66
1 parent dd28009
commit df46e66
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -287,7 +287,6 @@ set(INCLUDED_DIRECTORIES
 	"dScripts/zone/PROPERTY/GF"
 	"dScripts/zone/PROPERTY/NS"
 
-	"thirdparty/libbcrypt/include"
 	"thirdparty/magic_enum/include/magic_enum"
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
@@ -311,6 +310,12 @@ foreach (dir ${INCLUDED_DIRECTORIES})
 	include_directories(${PROJECT_SOURCE_DIR}/${dir})
 endforeach()
 
+if (NOT WIN32)
+	include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include/bcrypt")
+endif()
+include_directories("${PROJECT_SOURCE_DIR}/thirdparty/libbcrypt/include")
+
+
 # Add linking directories:
 link_directories(${PROJECT_BINARY_DIR})
 

diff --git a/dCommon/Game.h b/dCommon/Game.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <iosfwd>
+#include <string>
 #include <random>
 
 class dServer;

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -16,6 +16,12 @@ file(
 
 add_library(bcrypt ${SOURCES_LIBBCRYPT})
 
+# Because we are not using the libbcrypt CMakeLists.txt, we need to include these headers for the library to use.
+# fortunately they are only needed for building the libbcrypt directory and nothing else, so these are marked private.
+
+target_include_directories(bcrypt PRIVATE "libbcrypt/include")
+target_include_directories(bcrypt PRIVATE "libbcrypt/src")
+
 # Source code for sqlite
 add_subdirectory(SQLite)