Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
16 changed files with 203 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/basis_universal/SCsub
View file

@ -45,11 +45,7 @@ if basisu_encoder:
transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"]
# Treat Basis headers as system headers to avoid raising warnings. Not supported on MSVC.
if not env.msvc:
env_basisu.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path])
else:
env_basisu.Prepend(CPPPATH=[thirdparty_dir])
env_basisu.Prepend(CPPPATH=[thirdparty_dir])
if basisu_encoder:
env_basisu.Prepend(CPPPATH=["#thirdparty/tinyexr"])

7
modules/basis_universal/image_compress_basisu.cpp
View file

@ -36,6 +36,11 @@
#include "core/string/print_string.h"
#include "servers/rendering/rendering_server.h"
GODOT_GCC_WARNING_PUSH
GODOT_GCC_WARNING_IGNORE("-Wenum-conversion")
GODOT_GCC_WARNING_IGNORE("-Wshadow")
GODOT_GCC_WARNING_IGNORE("-Wunused-value")
#include <transcoder/basisu_transcoder.h>
#ifdef TOOLS_ENABLED
#include <encoder/basisu_comp.h>
@ -44,6 +49,8 @@ static Mutex init_mutex;
static bool initialized = false;
#endif
GODOT_GCC_WARNING_POP
void basis_universal_init() {
basist::basisu_transcoder_init();
}