Skip to content

Commit b950247

Browse files
RepiteoRepiteo
committed
SCons: Remove system includes
1 parent 56d5624 commit b950247

File tree

16 files changed

+203
-49
lines changed

16 files changed

+203
-49
lines changed

‎drivers/gl_context/SCsub‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ if env["platform"] in ["macos", "windows", "linuxbsd"]:
1313

1414
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
1515

16-
# Treat glad headers as system headers to avoid raising warnings. Not supported on MSVC.
17-
if not env.msvc:
18-
env.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
19-
else:
20-
env.Prepend(CPPPATH=[thirdparty_dir])
16+
env.Prepend(CPPPATH=[thirdparty_dir])
2117

2218
env.Append(CPPDEFINES=["GLAD_ENABLED"])
2319
env.Append(CPPDEFINES=["EGL_ENABLED"])

‎modules/basis_universal/SCsub‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@ if basisu_encoder:
4545

4646
transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"]
4747

48-
# Treat Basis headers as system headers to avoid raising warnings. Not supported on MSVC.
49-
if not env.msvc:
50-
env_basisu.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
51-
else:
52-
env_basisu.Prepend(CPPPATH=[thirdparty_dir])
48+
env_basisu.Prepend(CPPPATH=[thirdparty_dir])
5349

5450
if basisu_encoder:
5551
env_basisu.Prepend(CPPPATH=["#thirdparty/tinyexr"])

‎modules/basis_universal/image_compress_basisu.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
#include "core/string/print_string.h"
3737
#include "servers/rendering/rendering_server.h"
3838

39+
GODOT_GCC_WARNING_PUSH
40+
GODOT_GCC_WARNING_IGNORE("-Wenum-conversion")
41+
GODOT_GCC_WARNING_IGNORE("-Wshadow")
42+
GODOT_GCC_WARNING_IGNORE("-Wunused-value")
43+
3944
#include <transcoder/basisu_transcoder.h>
4045
#ifdef TOOLS_ENABLED
4146
#include <encoder/basisu_comp.h>
@@ -44,6 +49,8 @@ static Mutex init_mutex;
4449
static bool initialized = false;
4550
#endif
4651

52+
GODOT_GCC_WARNING_POP
53+
4754
void basis_universal_init() {
4855
basist::basisu_transcoder_init();
4956
}

‎modules/glslang/SCsub‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,7 @@ if env["builtin_glslang"]:
6262

6363
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
6464

65-
# Treat glslang headers as system headers to avoid raising warnings. Not supported on MSVC.
66-
# Include `#thirdparty` to workaround mismatch between location of `SPIRV` in library source
67-
# and in installed public headers.
68-
if not env.msvc:
69-
env_glslang.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path, "-isystem", Dir("#thirdparty").path])
70-
else:
71-
env_glslang.Prepend(CPPPATH=[thirdparty_dir, "#thirdparty"])
65+
env_glslang.Prepend(CPPPATH=[thirdparty_dir, "#thirdparty"])
7266

7367
env_glslang.Append(CPPDEFINES=[("ENABLE_OPT", 0)])
7468

‎modules/glslang/register_types.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@
3333
#include "core/config/engine.h"
3434
#include "shader_compile.h"
3535

36+
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
37+
3638
#include <glslang/Public/ResourceLimits.h>
3739
#include <glslang/Public/ShaderLang.h>
3840
#include <glslang/SPIRV/GlslangToSpv.h>
3941

42+
GODOT_GCC_WARNING_POP
43+
4044
Vector<uint8_t> compile_glslang_shader(RenderingDeviceCommons::ShaderStage p_stage, const String &p_source_code, RenderingDeviceCommons::ShaderLanguageVersion p_language_version, RenderingDeviceCommons::ShaderSpirvVersion p_spirv_version, String *r_error) {
4145
Vector<uint8_t> ret;
4246
EShLanguage stages[RenderingDeviceCommons::SHADER_STAGE_MAX] = {

‎modules/minimp3/SCsub‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ env_minimp3 = env_modules.Clone()
88

99
thirdparty_dir = "#thirdparty/minimp3/"
1010

11-
# Treat minimp3 headers as system headers to avoid raising warnings. Not supported on MSVC.
12-
if not env.msvc:
13-
env_minimp3.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
14-
else:
15-
env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
11+
env_minimp3.Prepend(CPPPATH=[thirdparty_dir])
1612

1713
if not env["minimp3_extra_formats"]:
1814
env_minimp3.Append(CPPDEFINES=["MINIMP3_ONLY_MP3"])

‎modules/text_server_adv/SCsub‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -512,12 +512,8 @@ if env["builtin_icu4c"]:
512512
module_obj = []
513513

514514
if env["builtin_msdfgen"] and msdfgen_enabled:
515-
# Treat msdfgen headers as system headers to avoid raising warnings. Not supported on MSVC.
516515
env_text_server_adv.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
517-
if not env.msvc:
518-
env_text_server_adv.Append(CPPFLAGS=["-isystem", Dir("#thirdparty/msdfgen").path])
519-
else:
520-
env_text_server_adv.Prepend(CPPPATH=["#thirdparty/msdfgen"])
516+
env_text_server_adv.Prepend(CPPPATH=["#thirdparty/msdfgen"])
521517

522518
if env["builtin_freetype"] and freetype_enabled:
523519
env_text_server_adv.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])

‎modules/text_server_adv/text_server_adv.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ using namespace godot;
6767
// Thirdparty headers.
6868

6969
#ifdef MODULE_MSDFGEN_ENABLED
70+
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
7071
GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4458) // "Declaration of 'identifier' hides class member".
7172

7273
#include <core/EdgeHolder.h>
@@ -75,6 +76,7 @@ GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4458) // "Declaration of 'identifier' hides c
7576
#include <core/edge-selectors.h>
7677
#include <msdfgen.h>
7778

79+
GODOT_GCC_WARNING_POP
7880
GODOT_MSVC_WARNING_POP
7981
#endif
8082

‎modules/text_server_fb/SCsub‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@ if "svg" in env.module_list:
1717
env_text_server_fb.Append(CPPDEFINES=["TVG_STATIC"])
1818

1919
if env["builtin_msdfgen"] and msdfgen_enabled:
20-
# Treat msdfgen headers as system headers to avoid raising warnings. Not supported on MSVC.
2120
env_text_server_fb.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
22-
if not env.msvc:
23-
env_text_server_fb.Append(CPPFLAGS=["-isystem", Dir("#thirdparty/msdfgen").path])
24-
else:
25-
env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"])
21+
env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"])
2622

2723
if env["builtin_freetype"] and freetype_enabled:
2824
env_text_server_fb.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])

‎modules/text_server_fb/text_server_fb.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ using namespace godot;
6262
// Thirdparty headers.
6363

6464
#ifdef MODULE_MSDFGEN_ENABLED
65+
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
6566
GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4458) // "Declaration of 'identifier' hides class member".
6667

6768
#include <core/EdgeHolder.h>
@@ -70,6 +71,7 @@ GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4458) // "Declaration of 'identifier' hides c
7071
#include <core/edge-selectors.h>
7172
#include <msdfgen.h>
7273

74+
GODOT_GCC_WARNING_POP
7375
GODOT_MSVC_WARNING_POP
7476
#endif
7577

0 commit comments

Comments
 (0)