From df46e66f5d9d62df9a86b4e7a8507bde47fd139c Mon Sep 17 00:00:00 2001
From: David Markowitz <EmosewaMC@gmail.com>
Date: Sat, 30 Dec 2023 01:58:11 -0800
Subject: [PATCH] working

f
---
 CMakeLists.txt            | 7 ++++++-
 dCommon/Game.h            | 2 +-
 thirdparty/CMakeLists.txt | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 871d533db..aa7eb9b25 100644
--- 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
index 6e13276ae..972eea468 100644
--- 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
index 93c20729c..11d278c08 100644
--- 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)