josh/playerbot-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define TRINITY_PLAYERBOT_V2 for the scripts command target

Browse Source 
cs_playerbot_v2.cpp is compiled into the scripts_commands shared lib,
whose body is gated on #if TRINITY_PLAYERBOT_V2. That macro only ever
reached the module sub-libs linked into worldserver, so the command
script compiled to an empty stub and .playerbot was never registered.
Propagate the define to every SCRIPT_MODULE target when
BUILD_PLAYERBOT_V2 is on so GM commands/live PBC listener register.
This commit is contained in:
devbox
2026-08-14 13:01:08 +10:00
parent e565bd9734
commit 8bedbc1311
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/PlayerbotV2/playerbotv2_core_hooks.patch
+6 -1
View File
@@ -4168,7 +4168,7 @@ diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.t
index 3356fd9402..ecec635c89 100644 index 3356fd9402..ecec635c89 100644
--- a/src/server/scripts/CMakeLists.txt --- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt
@@ -166,6 +166,14 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) @@ -166,6 +166,19 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST})
PUBLIC PUBLIC
game) game)
@@ -4178,6 +4178,11 @@ index 3356fd9402..ecec635c89 100644
+ ${CMAKE_SOURCE_DIR}/src/plugins/playerbot/strategy + ${CMAKE_SOURCE_DIR}/src/plugins/playerbot/strategy
+ ${CMAKE_SOURCE_DIR}/src/modules/PlayerbotV2) + ${CMAKE_SOURCE_DIR}/src/modules/PlayerbotV2)
+ +
+ if(BUILD_PLAYERBOT_V2)
+ target_compile_definitions(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE
+ TRINITY_PLAYERBOT_V2=1)
+ endif()
+
+ +
+ +
set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} set_target_properties(${SCRIPT_MODULE_PROJECT_NAME}
src/modules/PlayerbotV2/playerbotv2_core_hooks.thordekk.patch
+6 -1
View File
@@ -3926,13 +3926,18 @@ diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.t
index 691ede0315..72e2133e83 100644 index 691ede0315..72e2133e83 100644
--- a/src/server/scripts/CMakeLists.txt --- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt +++ b/src/server/scripts/CMakeLists.txt
@@ -166,6 +166,10 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST}) @@ -166,6 +166,15 @@ foreach(SCRIPT_MODULE ${SCRIPT_MODULE_LIST})
PUBLIC PUBLIC
game) game)
+ target_include_directories(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE + target_include_directories(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE
+ ${CMAKE_SOURCE_DIR}/src/modules/PlayerbotV2) + ${CMAKE_SOURCE_DIR}/src/modules/PlayerbotV2)
+ +
+ if(BUILD_PLAYERBOT_V2)
+ target_compile_definitions(${SCRIPT_MODULE_PROJECT_NAME} PRIVATE
+ TRINITY_PLAYERBOT_V2=1)
+ endif()
+
+ +
set_target_properties(${SCRIPT_MODULE_PROJECT_NAME} set_target_properties(${SCRIPT_MODULE_PROJECT_NAME}
PROPERTIES PROPERTIES