From 8907cd467daa5a145fbe967a65a8c8f3aba444ec Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Thu, 25 Jan 2024 02:45:47 -0800 Subject: [PATCH] fix not building on unix --- dMasterServer/CMakeLists.txt | 4 +++- dServer/CMakeLists.txt | 4 ++++ dWorldServer/CMakeLists.txt | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dMasterServer/CMakeLists.txt b/dMasterServer/CMakeLists.txt index f29e1eb4..260e4f16 100644 --- a/dMasterServer/CMakeLists.txt +++ b/dMasterServer/CMakeLists.txt @@ -9,9 +9,11 @@ add_executable(MasterServer "MasterServer.cpp") add_compile_definitions(MasterServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"") target_include_directories(dMasterServer PUBLIC "." "${PROJECT_SOURCE_DIR}/dZoneManager" # InstanceManager.h uses dZMCommon.h + ${PROJECT_SOURCE_DIR}/dServer/ # BinaryPathFinder.h ) + target_link_libraries(dMasterServer ${COMMON_LIBRARIES}) -target_link_libraries(MasterServer ${COMMON_LIBRARIES} bcrypt dMasterServer) +target_link_libraries(MasterServer ${COMMON_LIBRARIES} bcrypt dMasterServer dServer) if(WIN32) add_dependencies(MasterServer WorldServer AuthServer ChatServer) diff --git a/dServer/CMakeLists.txt b/dServer/CMakeLists.txt index 356e55b7..f0952eb7 100644 --- a/dServer/CMakeLists.txt +++ b/dServer/CMakeLists.txt @@ -4,3 +4,7 @@ set(DSERVER_SOURCES add_library(dServer STATIC ${DSERVER_SOURCES}) target_include_directories(dServer PUBLIC ".") + +target_include_directories(dServer PRIVATE + ${PROJECT_SOURCE_DIR}/dCommon/ # BinaryPathFinder.h +) diff --git a/dWorldServer/CMakeLists.txt b/dWorldServer/CMakeLists.txt index 5eb11a09..1239a3c1 100644 --- a/dWorldServer/CMakeLists.txt +++ b/dWorldServer/CMakeLists.txt @@ -8,6 +8,10 @@ target_link_libraries(dWorldServer PUBLIC dGameBase dCommon) add_executable(WorldServer "WorldServer.cpp") add_compile_definitions(WorldServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"") +target_include_directories(WorldServer PRIVATE + ${PROJECT_SOURCE_DIR}/dServer/ # BinaryPathFinder.h +) + target_link_libraries(WorldServer ${COMMON_LIBRARIES} dScripts dGameBase @@ -15,4 +19,4 @@ target_link_libraries(WorldServer ${COMMON_LIBRARIES} dUtilities dGameMessages dInventory - dGame dChatFilter dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dNavigation) + dGame dChatFilter dZoneManager dPhysics Detour Recast tinyxml2 dWorldServer dNavigation dServer)