diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-07-22 16:31:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-22 16:31:01 +0200 |
| commit | 2f365bb9bb9f0402100ecd1c05670065fd95acf3 (patch) | |
| tree | 145c8ee4ae845d01f5e5607607223006d4b670b2 | |
| parent | c579c48461c5f6d3d98c1db4e116c5176fc69ba4 (diff) | |
| parent | 0aa7fcd41042f4ba96b259c438e5ea3d220c6cc9 (diff) | |
Merge pull request #20339 from akien-mga/scons-disable-with-tools
SCons: Prevent using disable_3d or disable_advanced_gui with tools=yes
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 50fb5bc48c..08c5b6d34f 100644 --- a/SConstruct +++ b/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']: |