mewin/scons-plus-plus
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Added wrapper for Gch builder. And disabled another warning because weird things are happening.

Browse Source
This commit is contained in:
Patrick 2023-12-21 19:18:25 +01:00
parent e6b8062865
commit 447a694eb0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SConscript
View File

@ -36,7 +36,7 @@ def _inject_dependency(dependency, kwargs: dict, add_sources: bool = True) -> No
_inject_list(kwargs, dependency, 'CPPDEFINES') _inject_list(kwargs, dependency, 'CPPDEFINES')
_inject_list(kwargs, dependency, 'LIBPATH') _inject_list(kwargs, dependency, 'LIBPATH')
_inject_list(kwargs, dependency, 'LIBS') _inject_list(kwargs, dependency, 'LIBS')
if add_sources and 'ADDITIONAL_SOURCES' in dependency: if add_sources and 'ADDITIONAL_SOURCES' in dependency and hasattr(kwargs['source'], 'extend'):
kwargs['source'].extend(dependency['ADDITIONAL_SOURCES']) kwargs['source'].extend(dependency['ADDITIONAL_SOURCES'])
if 'DEPENDENCIES' in dependency: if 'DEPENDENCIES' in dependency:
for inner_dependency in dependency['DEPENDENCIES']: for inner_dependency in dependency['DEPENDENCIES']:
@ -299,9 +299,11 @@ if env['COMPILER_FAMILY'] == 'gcc' or env['COMPILER_FAMILY'] == 'clang':
# GCC complains about missing initializer for "<anonymous>" that doesn't exist :/ # GCC complains about missing initializer for "<anonymous>" that doesn't exist :/
# also GCC complains about some (compiler generated) fields in coroutines not having any linkage # also GCC complains about some (compiler generated) fields in coroutines not having any linkage
# also -Wdangling-reference seems to produce a lot of false positives # also -Wdangling-reference seems to produce a lot of false positives
# also -Wmaybe-uninitialized seems to produce false positives (or a bug in the standard library?) # also -Wmaybe-uninitialized seems to produce false positives (or a bug in the standard library?))
# -Winit-list-lifetime triggers in vulkan.hpp even though it is disabled via pragma :/
env.Append(CCFLAGS = ['-Wno-missing-field-initializers', '-Wno-maybe-uninitialized']) env.Append(CCFLAGS = ['-Wno-missing-field-initializers', '-Wno-maybe-uninitialized'])
env.Append(CXXFLAGS = ['-Wno-subobject-linkage', '-Wno-dangling-reference']) env.Append(CXXFLAGS = ['-Wno-subobject-linkage', '-Wno-dangling-reference', '-Wno-init-list-lifetime'])
else: else:
# no-gnu-anonymous-struct - we don't care # no-gnu-anonymous-struct - we don't care
env.Append(CCFLAGS = ['-Wno-gnu-anonymous-struct']) env.Append(CCFLAGS = ['-Wno-gnu-anonymous-struct'])
@ -354,6 +356,10 @@ env.AddMethod(_wrap_builder(env.UnityLibrary, is_lib = True), 'UnityLibrary')
env.AddMethod(_wrap_builder(env.UnityStaticLibrary, is_lib = True), 'UnityStaticLibrary') env.AddMethod(_wrap_builder(env.UnityStaticLibrary, is_lib = True), 'UnityStaticLibrary')
env.AddMethod(_wrap_builder(env.UnitySharedLibrary, is_lib = True), 'UnitySharedLibrary') env.AddMethod(_wrap_builder(env.UnitySharedLibrary, is_lib = True), 'UnitySharedLibrary')
if hasattr(env, 'Gch'):
env.AddMethod(_wrap_builder(env.Gch), 'Gch')
if dump_env: if dump_env:
print('==== Begin Environment Dump =====') print('==== Begin Environment Dump =====')
print(env.Dump()) print(env.Dump())