Skip to content

Commit

Permalink
Merge pull request #1312 from Areloch/Torque_Tools_Ext_cmakeFlag
Browse files Browse the repository at this point in the history
Adds a TORQUE_TOOLS_EXT cmake flag/preprocessor
  • Loading branch information
Azaezel committed Sep 1, 2024
2 parents 2dbfc16 + 03efeda commit d82a78e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Engine/source/console/consoleFunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2803,7 +2803,7 @@ DefineEngineFunction(getTimestamp, const char*, (), ,
return returnBuffer;
}

#ifdef TORQUE_TOOLS
#ifdef TORQUE_TOOLS_EXT_COMMANDS
DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const char* callBackFunction), (""), "")
{
if (commandLineAction && commandLineAction[0] != '\0')
Expand All @@ -2819,7 +2819,9 @@ DefineEngineFunction(systemCommand, S32, (const char* commandLineAction, const c

return -1;
}
#endif

#ifdef TORQUE_TOOLS
const char* getDocsLink(const char* filename, U32 lineNumber)
{
Vector<String> fileStringSplit;
Expand Down
3 changes: 3 additions & 0 deletions Tools/CMake/modules/tools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ if(TORQUE_TOOLS)
source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/environment/editors/" PREFIX "Modules/TOOLS/environment" FILES ${TORQUE_TOOLS_SOURCES2})
source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/forest/editor/" PREFIX "Modules/TOOLS/forest" FILES ${TORQUE_TOOLS_SOURCES3})
endif(TORQUE_TOOLS)
if(TORQUE_TOOLS_EXT_COMMANDS)
set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TOOLS_EXT_COMMANDS)
endif(TORQUE_TOOLS_EXT_COMMANDS)
1 change: 1 addition & 0 deletions Tools/CMake/torque_configs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ advanced_option(TORQUE_DEBUG_NET "debug network" OFF)
advanced_option(TORQUE_DEBUG_NET_MOVES "debug network moves" OFF)
advanced_option(TORQUE_ENABLE_ASSERTS "enables or disable asserts" OFF)
advanced_option(TORQUE_TOOLS "Enable or disable the tools" ON)
advanced_option(TORQUE_TOOLS_EXT_COMMANDS "Enable or disable some extended functionality like shell commands or free write access" OFF)
advanced_option(TORQUE_ENABLE_PROFILER "Enable or disable the profiler" OFF)
advanced_option(TORQUE_SHOW_LEGACY_FILE_FIELDS "If on, shows legacy direct file path fields in the inspector." OFF)

Expand Down

0 comments on commit d82a78e

Please sign in to comment.