49fec646cb
Fix -Wunused-variable, -Wunused-but-set-variable and -Wswitch warnings raised by GCC 8 and 9. Fix -Wunused-function, -Wunused-private-field and -Wtautological-constant-out-of-range-compare raised by Clang. Fix MSVC 2019 warning C4804 (unsafe use of type 'bool' in comparison operation). GCC -Wcpp warnings/Clang -W#warnings (`#warning`) are no longer raising errors and will thus not abort compilation with `werror=yes`. Treat glslang headers are system headers to avoid raising warnings. Re-enables us to build with `werror=yes` on Linux and macOS, thus catching warnings that would be introduced by new code. Fixes #36132.
73 lines
2.9 KiB
Python
73 lines
2.9 KiB
Python
#!/usr/bin/env python
|
|
|
|
Import('env')
|
|
Import('env_modules')
|
|
|
|
env_glslang = env_modules.Clone()
|
|
|
|
# Thirdparty source files
|
|
if env['builtin_glslang']:
|
|
thirdparty_dir = "#thirdparty/glslang/"
|
|
thirdparty_sources = [
|
|
"glslang/MachineIndependent/RemoveTree.cpp",
|
|
"glslang/MachineIndependent/ParseHelper.cpp",
|
|
"glslang/MachineIndependent/iomapper.cpp",
|
|
"glslang/MachineIndependent/propagateNoContraction.cpp",
|
|
"glslang/MachineIndependent/Intermediate.cpp",
|
|
"glslang/MachineIndependent/linkValidate.cpp",
|
|
"glslang/MachineIndependent/attribute.cpp",
|
|
"glslang/MachineIndependent/Scan.cpp",
|
|
"glslang/MachineIndependent/Initialize.cpp",
|
|
"glslang/MachineIndependent/Constant.cpp",
|
|
"glslang/MachineIndependent/reflection.cpp",
|
|
"glslang/MachineIndependent/limits.cpp",
|
|
"glslang/MachineIndependent/preprocessor/PpScanner.cpp",
|
|
"glslang/MachineIndependent/preprocessor/PpTokens.cpp",
|
|
"glslang/MachineIndependent/preprocessor/PpAtom.cpp",
|
|
"glslang/MachineIndependent/preprocessor/PpContext.cpp",
|
|
"glslang/MachineIndependent/preprocessor/Pp.cpp",
|
|
"glslang/MachineIndependent/InfoSink.cpp",
|
|
"glslang/MachineIndependent/intermOut.cpp",
|
|
"glslang/MachineIndependent/SymbolTable.cpp",
|
|
"glslang/MachineIndependent/glslang_tab.cpp",
|
|
"glslang/MachineIndependent/pch.cpp",
|
|
"glslang/MachineIndependent/Versions.cpp",
|
|
"glslang/MachineIndependent/ShaderLang.cpp",
|
|
"glslang/MachineIndependent/parseConst.cpp",
|
|
"glslang/MachineIndependent/PoolAlloc.cpp",
|
|
"glslang/MachineIndependent/ParseContextBase.cpp",
|
|
"glslang/MachineIndependent/IntermTraverse.cpp",
|
|
"glslang/GenericCodeGen/Link.cpp",
|
|
"glslang/GenericCodeGen/CodeGen.cpp",
|
|
"OGLCompilersDLL/InitializeDll.cpp",
|
|
"SPIRV/InReadableOrder.cpp",
|
|
"SPIRV/GlslangToSpv.cpp",
|
|
"SPIRV/SpvBuilder.cpp",
|
|
"SPIRV/SpvTools.cpp",
|
|
"SPIRV/disassemble.cpp",
|
|
"SPIRV/doc.cpp",
|
|
"SPIRV/SPVRemapper.cpp",
|
|
"SPIRV/SpvPostProcess.cpp",
|
|
"SPIRV/Logger.cpp"
|
|
]
|
|
|
|
if (env["platform"]=="windows"):
|
|
thirdparty_sources.append("glslang/OSDependent/Windows/ossource.cpp")
|
|
else:
|
|
thirdparty_sources.append("glslang/OSDependent/Unix/ossource.cpp")
|
|
|
|
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
|
|
|
|
# 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])
|
|
else:
|
|
env_glslang.Prepend(CPPPATH=[thirdparty_dir])
|
|
|
|
env_thirdparty = env_glslang.Clone()
|
|
env_thirdparty.disable_warnings()
|
|
env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
|
|
|
|
# Godot's own source files
|
|
env_glslang.add_source_files(env.modules_sources, "*.cpp")
|