TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for replacing the main.tscript file with a specified Console Function

Browse source
This commit is contained in:
Lukas Aldershaab 2023-10-08 23:16:43 +02:00 committed by Brian Roberts
parent bcea9bfc3a
commit df8041e689
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/app/mainLoop.cpp
View file

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

3
Tools/CMake/torqueConfig.h.in
View file

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

2
Tools/CMake/torque_configs.cmake
View file

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