seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SCons: Remove system includes

Browse Source
This commit is contained in:
Thaddeus Crews
2025-10-06 13:16:02 -05:00
parent 56d5624e88
commit b95024752a
16 changed files with 203 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/text_server_fb/SCsub
View File

@ -17,12 +17,8 @@ if "svg" in env.module_list:
env_text_server_fb.Append(CPPDEFINES=["TVG_STATIC"])
if env["builtin_msdfgen"] and msdfgen_enabled:
# Treat msdfgen headers as system headers to avoid raising warnings. Not supported on MSVC.
env_text_server_fb.Append(CPPDEFINES=[("MSDFGEN_PUBLIC", "")])
if not env.msvc:
env_text_server_fb.Append(CPPFLAGS=["-isystem", Dir("#thirdparty/msdfgen").path])
else:
env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"])
env_text_server_fb.Prepend(CPPPATH=["#thirdparty/msdfgen"])
if env["builtin_freetype"] and freetype_enabled:
env_text_server_fb.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])

2
modules/text_server_fb/text_server_fb.cpp
View File

@ -62,6 +62,7 @@ using namespace godot;
// Thirdparty headers.
#ifdef MODULE_MSDFGEN_ENABLED
GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4458) // "Declaration of 'identifier' hides class member".
#include <core/EdgeHolder.h>
@ -70,6 +71,7 @@ GODOT_MSVC_WARNING_PUSH_AND_IGNORE(4458) // "Declaration of 'identifier' hides c
#include <core/edge-selectors.h>
#include <msdfgen.h>
GODOT_GCC_WARNING_POP
GODOT_MSVC_WARNING_POP
#endif