SCons: Prevent using disable_3d or disable_advanced_gui with tools=yes
Those make no sense for tools build, as the editor uses advanced GUI features heavily, and adding checks for 3D/physics features everywhere in the editor would be cumbersome (and error-prone). Fixes #1701.
This commit is contained in:
parent
92415365c8
commit
0aa7fcd410
1 changed files with 10 additions and 2 deletions
12
SConstruct
12
SConstruct
|
@ -417,11 +417,19 @@ if selected_platform in platform_list:
|
|||
if env['tools']:
|
||||
env.Append(CPPDEFINES=['TOOLS_ENABLED'])
|
||||
if env['disable_3d']:
|
||||
env.Append(CPPDEFINES=['_3D_DISABLED'])
|
||||
if env['tools']:
|
||||
print("Build option 'disable_3d=yes' cannot be used with 'tools=yes' (editor), only with 'tools=no' (export template).")
|
||||
sys.exit(255)
|
||||
else:
|
||||
env.Append(CPPDEFINES=['_3D_DISABLED'])
|
||||
if env['gdscript']:
|
||||
env.Append(CPPDEFINES=['GDSCRIPT_ENABLED'])
|
||||
if env['disable_advanced_gui']:
|
||||
env.Append(CPPDEFINES=['ADVANCED_GUI_DISABLED'])
|
||||
if env['tools']:
|
||||
print("Build option 'disable_advanced_gui=yes' cannot be used with 'tools=yes' (editor), only with 'tools=no' (export template).")
|
||||
sys.exit(255)
|
||||
else:
|
||||
env.Append(CPPDEFINES=['ADVANCED_GUI_DISABLED'])
|
||||
if env['minizip']:
|
||||
env.Append(CPPDEFINES=['MINIZIP_ENABLED'])
|
||||
if env['xml']:
|
||||
|
|
Loading…
Reference in a new issue