fix: rebase

This commit is contained in:
Xiphoseer 2024-01-04 03:20:06 +01:00
parent d67ac7759b
commit d6d5cb7515
4 changed files with 4 additions and 2 deletions

View File

@ -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"
$<TARGET_PROPERTY:dPropertyBehaviors,INTERFACE_INCLUDE_DIRECTORIES>
"${PROJECT_SOURCE_DIR}/dCommon"
"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
"${PROJECT_SOURCE_DIR}/dCommon/dClient"

View File

@ -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

View File

@ -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

View File

@ -55,4 +55,3 @@ target_include_directories(dScriptsServer INTERFACE
$<TARGET_PROPERTY:dScriptsServerMap,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:dScriptsServerPets,INTERFACE_INCLUDE_DIRECTORIES>
)