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

Merge pull request #1227 from Azaezel/alpha41/compileFlagFixes

Browse source 
TORQUE_TOOLS off compile fix
This commit is contained in:
Brian Roberts 2024-03-10 14:58:24 -05:00 committed by GitHub
parent 9f5c74c79a 07ed59a872
commit bae4f8cf43
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/console/consoleFunctions.h
View file

@ -18,7 +18,12 @@ void gotoWebPage(const char* address);
bool getDocsURL(void* obj, const char* array, const char* data);
const char* getDocsLink(const char* filename, U32 lineNumber);
#ifdef TORQUE_TOOLS
#define docsURL addGroup("Ungrouped");\
addProtectedField("docsURL", TypeBool, Offset(mDocsClick, ConsoleObject), &getDocsURL, &defaultProtectedGetFn, getDocsLink(__FILE__,__LINE__), AbstractClassRep::FieldFlags::FIELD_ComponentInspectors);\
endGroup("Ungrouped")
#else
#define docsURL NULL
#endif
#endif

2
Engine/source/gui/editor/guiMenuBar.cpp
View file

@ -581,6 +581,7 @@ PopupMenu* GuiMenuBar::findMenu(String barTitle)
//-----------------------------------------------------------------------------
// Console Methods
//-----------------------------------------------------------------------------
#ifdef TORQUE_TOOLS
DefineEngineMethod(GuiMenuBar, attachToCanvas, void, (const char *canvas, S32 pos), , "(GuiCanvas, pos)")
{
GuiCanvas* canv = dynamic_cast<GuiCanvas*>(Sim::findObject(canvas));
@ -597,6 +598,7 @@ DefineEngineMethod(GuiMenuBar, removeFromCanvas, void, (), , "()")
if(canvas)
canvas->setMenuBar(nullptr);
}
#endif
DefineEngineMethod(GuiMenuBar, getMenuCount, S32, (), , "()")
{