diff --git a/Engine/source/app/mainLoop.cpp b/Engine/source/app/mainLoop.cpp index 807c0a960..2acb64845 100644 --- a/Engine/source/app/mainLoop.cpp +++ b/Engine/source/app/mainLoop.cpp @@ -450,7 +450,12 @@ bool StandardMainLoop::handleCommandLine( S32 argc, const char **argv ) Stream *mainCsStream = NULL; // The working filestream. - FileStream str; + FileStream str; + +#ifdef TORQUE_ENTRY_FUNCTION + Con::executef(TORQUE_ENTRY_FUNCTION); + return true; +#endif const char *defaultScriptName = "main." TORQUE_SCRIPT_EXTENSION; bool useDefaultScript = true; diff --git a/Tools/CMake/torqueConfig.h.in b/Tools/CMake/torqueConfig.h.in index 9e866aa4c..39b9a7c03 100644 --- a/Tools/CMake/torqueConfig.h.in +++ b/Tools/CMake/torqueConfig.h.in @@ -87,6 +87,9 @@ /// Define the default extension to be used for TorqueScript files #cmakedefine TORQUE_SCRIPT_EXTENSION "@TORQUE_SCRIPT_EXTENSION@" +/// Specify a console function to execute instead of looking for a main.tscript file +#cmakedefine TORQUE_ENTRY_FUNCTION "@TORQUE_ENTRY_FUNCTION@" + // Define me if this build is a tools build #cmakedefine TORQUE_PLAYER diff --git a/Tools/CMake/torque_configs.cmake b/Tools/CMake/torque_configs.cmake index f6a699089..e6a040d0b 100644 --- a/Tools/CMake/torque_configs.cmake +++ b/Tools/CMake/torque_configs.cmake @@ -29,6 +29,8 @@ mark_as_advanced(WIN32) #general advanced_option(TORQUE_MULTITHREAD "Multi Threading" ON) advanced_option(TORQUE_DISABLE_MEMORY_MANAGER "Disable memory manager" ON) +set(TORQUE_ENTRY_FUNCTION "" CACHE STRING "Specify a console function to execute instead of looking for a main.tscript file") +mark_as_advanced(TORQUE_ENTRY_FUNCTION) #fileIO set(TORQUE_APP_PASSWORD "changeme" CACHE STRING "zip file password")