From d6d5cb7515ab82b79a911ba1512222d525e32398 Mon Sep 17 00:00:00 2001 From: Xiphoseer Date: Thu, 4 Jan 2024 03:20:06 +0100 Subject: [PATCH] fix: rebase --- dGame/CMakeLists.txt | 1 + dGame/dComponents/CMakeLists.txt | 2 ++ dNet/CMakeLists.txt | 2 +- dScripts/02_server/CMakeLists.txt | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dGame/CMakeLists.txt b/dGame/CMakeLists.txt index b40d4e53..76af2e7e 100644 --- a/dGame/CMakeLists.txt +++ b/dGame/CMakeLists.txt @@ -17,6 +17,7 @@ add_library(dGameBase OBJECT ${DGAME_SOURCES}) target_precompile_headers(dGameBase PRIVATE ${HEADERS_DGAME}) target_include_directories(dGameBase PUBLIC "." "dEntity" PRIVATE "dComponents" "dGameMessages" "dBehaviors" "dMission" "dUtilities" "dInventory" + $ "${PROJECT_SOURCE_DIR}/dCommon" "${PROJECT_SOURCE_DIR}/dCommon/dEnums" "${PROJECT_SOURCE_DIR}/dCommon/dClient" diff --git a/dGame/dComponents/CMakeLists.txt b/dGame/dComponents/CMakeLists.txt index 4b691154..c9f0177c 100644 --- a/dGame/dComponents/CMakeLists.txt +++ b/dGame/dComponents/CMakeLists.txt @@ -51,6 +51,8 @@ set(DGAME_DCOMPONENTS_SOURCES add_library(dComponents OBJECT ${DGAME_DCOMPONENTS_SOURCES}) target_include_directories(dComponents PUBLIC "." + "${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors" # via ModelComponent.h + "${PROJECT_SOURCE_DIR}/dGame/dPropertyBehaviors/ControlBehaviorMessages" "${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h "${PROJECT_SOURCE_DIR}/dGame/dBehaviors" # via InventoryComponent.h "${PROJECT_SOURCE_DIR}/dGame/dInventory" # via InventoryComponent.h diff --git a/dNet/CMakeLists.txt b/dNet/CMakeLists.txt index f3f57ba4..8717da79 100644 --- a/dNet/CMakeLists.txt +++ b/dNet/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(dNet PRIVATE ${PROJECT_SOURCE_DIR}/dCommon/dEnums ${PROJECT_SOURCE_DIR}/dZoneManager - + ${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase ${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables ${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase diff --git a/dScripts/02_server/CMakeLists.txt b/dScripts/02_server/CMakeLists.txt index 53a8ee46..8114b226 100644 --- a/dScripts/02_server/CMakeLists.txt +++ b/dScripts/02_server/CMakeLists.txt @@ -55,4 +55,3 @@ target_include_directories(dScriptsServer INTERFACE $ $ ) -