diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-30 15:07:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-30 15:07:00 +0200 |
| commit | b383484e445b1554c811556181a7815e0308fd62 (patch) | |
| tree | dc038e9d922bc93b2673c52f59fc1eaf862075e1 /modules/glslang | |
| parent | 0168709978154a89f137b44f33647e5d28a46250 (diff) | |
| parent | 3644036fd3d8678ac44695cc49ae63c4aaeb1b97 (diff) | |
Merge pull request #37421 from akien-mga/python-format-black
SCons: Format buildsystem files with psf/black
Diffstat (limited to 'modules/glslang')
| -rw-r--r-- | modules/glslang/SCsub | 12 | ||||
| -rw-r--r-- | modules/glslang/config.py | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/modules/glslang/SCsub b/modules/glslang/SCsub index ae102238f2..c1d23a138b 100644 --- a/modules/glslang/SCsub +++ b/modules/glslang/SCsub @@ -1,12 +1,12 @@ #!/usr/bin/env python -Import('env') -Import('env_modules') +Import("env") +Import("env_modules") env_glslang = env_modules.Clone() # Thirdparty source files -if env['builtin_glslang']: +if env["builtin_glslang"]: thirdparty_dir = "#thirdparty/glslang/" thirdparty_sources = [ "glslang/MachineIndependent/RemoveTree.cpp", @@ -48,10 +48,10 @@ if env['builtin_glslang']: "SPIRV/doc.cpp", "SPIRV/SPVRemapper.cpp", "SPIRV/SpvPostProcess.cpp", - "SPIRV/Logger.cpp" + "SPIRV/Logger.cpp", ] - if (env["platform"]=="windows"): + if env["platform"] == "windows": thirdparty_sources.append("glslang/OSDependent/Windows/ossource.cpp") else: thirdparty_sources.append("glslang/OSDependent/Unix/ossource.cpp") @@ -60,7 +60,7 @@ if env['builtin_glslang']: # Treat glslang headers as system headers to avoid raising warnings. Not supported on MSVC. if not env.msvc: - env_glslang.Append(CPPFLAGS=['-isystem', Dir(thirdparty_dir).path]) + env_glslang.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path]) else: env_glslang.Prepend(CPPPATH=[thirdparty_dir]) diff --git a/modules/glslang/config.py b/modules/glslang/config.py index 1c8cd12a2d..d22f9454ed 100644 --- a/modules/glslang/config.py +++ b/modules/glslang/config.py @@ -1,5 +1,6 @@ def can_build(env, platform): return True + def configure(env): pass |