diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index fea0e0ab28..83bd1560ff 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,6 @@ from collections import OrderedDict import methods import glsl_builders import gles3_builders -from platform_methods import run_in_subprocess # Scan possible build platforms @@ -301,6 +300,13 @@ opts.Update(env_base) env_base["platform"] = selected_platform # Must always be re-set after calling opts.Update(). Help(opts.GenerateHelpText(env_base)) +# Detect and print a warning listing unknown SCons variables to ease troubleshooting. +unknown = opts.UnknownVariables() +if unknown: + print("WARNING: Unknown SCons variables were passed and will be ignored:") + for item in unknown.items(): + print(" " + item[0] + "=" + item[1]) + # add default include paths env_base.Prepend(CPPPATH=["#"]) @@ -706,20 +712,14 @@ if selected_platform in platform_list: suffix="glsl.gen.h", src_suffix=".glsl", ), + "GLES3_GLSL": env.Builder( + action=env.Run(gles3_builders.build_gles3_headers, 'Building GLES3 GLSL header: "$TARGET"'), + suffix="glsl.gen.h", + src_suffix=".glsl", + ), } env.Append(BUILDERS=GLSL_BUILDERS) - if not env["platform"] == "server": - env.Append( - BUILDERS={ - "GLES3_GLSL": env.Builder( - action=run_in_subprocess(gles3_builders.build_gles3_headers), - suffix="glsl.gen.h", - src_suffix=".glsl", - ) - } - ) - scons_cache_path = os.environ.get("SCONS_CACHE") if scons_cache_path != None: CacheDir(scons_cache_path) |